Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Apr 2011 08:50:07 GMT
From:      Sergey Kandaurov <pluknet@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/156346: [patch] devel/py-freebsd: fix build on 9.x ['CTLTYPE_QUAD' undeclared]
Message-ID:  <201104120850.p3C8o7xj053978@red.freebsd.org>
Resent-Message-ID: <201104120900.p3C90NeW054510@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         156346
>Category:       ports
>Synopsis:       [patch] devel/py-freebsd: fix build on 9.x ['CTLTYPE_QUAD' undeclared]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 12 09:00:23 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Kandaurov
>Release:        FreeBSD 9.0-CURRENT
>Organization:
>Environment:
FreeBSD 9.0-CURRENT #68 r220102:220330M
>Description:
This patch fixes "BROKEN=does not compile on 9.X"

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	Makefile.diff
#	files/freebsd9_patch-src-sysctl.c
#
echo x - Makefile.diff
sed 's/^X//' >Makefile.diff << 'ad2ded6500d2f53baa2cfd8297bb8250'
X--- Makefile.orig	2011-04-12 12:38:33.000000000 +0400
X+++ Makefile	2011-04-12 12:40:51.000000000 +0400
X@@ -37,5 +37,8 @@
X     (${OSVERSION} < 800000 && ${OSVERSION} >= 701103)
X EXTRA_PATCHES+=	${FILESDIR}/freebsd8_patch-src-jail.c
X .endif
X+.if ${OSVERSION} >= 900030
X+EXTRA_PATCHES+=	${FILESDIR}/freebsd9_patch-src-sysctl.c
X+.endif
X 
X .include <bsd.port.post.mk>
ad2ded6500d2f53baa2cfd8297bb8250
echo x - files/freebsd9_patch-src-sysctl.c
sed 's/^X//' >files/freebsd9_patch-src-sysctl.c << 'e5a237c0a16ff35f1db2d78c06794513'
X--- src/sysctl.c.orig	2011-04-12 12:30:50.000000000 +0400
X+++ src/sysctl.c	2011-04-12 12:37:45.000000000 +0400
X@@ -121,7 +121,7 @@ const size_t sysctl_type_sizes[CTLTYPE] 
X 	0,			/* CTLTYPE_NODE */
X 	sizeof(int),		/* CTLTYPE_INT */
X 	0,			/* CTLTYPE_STRING */
X-	sizeof(quad_t),		/* CTLTYPE_QUAD */
X+	sizeof(quad_t),		/* CTLTYPE_S64 */
X 	0,			/* CTLTYPE_OPAQUE */
X 	sizeof(unsigned int),	/* CTLTYPE_UINT */
X 	sizeof(long),		/* CTLTYPE_LONG */
X@@ -329,7 +329,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar
X 	case CTLTYPE_UINT:
X 	case CTLTYPE_LONG:
X 	case CTLTYPE_ULONG:
X-	case CTLTYPE_QUAD:
X+	case CTLTYPE_S64:
X 		if (!PyInt_Check(newobj) && !PyLong_Check(newobj)) {
X 			PyErr_SetString(PyExc_TypeError,
X 				"argument 2 must be integer for this node");
X@@ -350,7 +350,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar
X 		case CTLTYPE_ULONG:
X 			val.m_ulong = PyLong_AsUnsignedLong(newobj);
X 			break;
X-		case CTLTYPE_QUAD:
X+		case CTLTYPE_S64:
X 			val.m_quad = (quad_t)PyLong_AsLongLong(newobj);
X 			break;
X 		}
X@@ -439,7 +439,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar
X 	case CTLTYPE_STRING:
X 		ret = PyString_FromStringAndSize(oldp, oldlen - 1);
X 		break;
X-	case CTLTYPE_QUAD:
X+	case CTLTYPE_S64:
X 		assert(oldlen == sizeof(quad_t));
X 		ret = PyLong_FromLongLong((long long)*(quad_t *)oldp);
X 		break;
e5a237c0a16ff35f1db2d78c06794513
exit



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104120850.p3C8o7xj053978>