diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-05-25 15:51:04 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-05-25 15:51:04 +0000 |
| commit | 0c7d68598878a2ce93c16762ec1402e7b2fd4a19 (patch) | |
| tree | 8c53d398848927101c45f16408b40655676305eb /sys-freebsd | |
| parent | Version bump #417495 by Jason Donenfeld. (diff) | |
| download | gentoo-2-0c7d68598878a2ce93c16762ec1402e7b2fd4a19.tar.gz gentoo-2-0c7d68598878a2ce93c16762ec1402e7b2fd4a19.tar.bz2 gentoo-2-0c7d68598878a2ce93c16762ec1402e7b2fd4a19.zip | |
add the sysctlt fix from freebsd-sources here too with USE=build
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch | 13 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 57c3af62b5a7..66b80345b5a6 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.148 2012/05/25 15:14:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.149 2012/05/25 15:51:04 aballier Exp $ + + 25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild, + +files/freebsd-sources-9.0-sysctluint.patch: + add the sysctlt fix from freebsd-sources here too with USE=build 25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild: bootstrap libssp_nonshared when needed. diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch new file mode 100644 index 000000000000..751a77c843bb --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch @@ -0,0 +1,13 @@ +u_int is defined in sys/types.h +makes header usable alone. + +--- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400 ++++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400 +@@ -788,6 +788,7 @@ + struct sysctl_req *); + #else /* !_KERNEL */ + #include <sys/cdefs.h> ++#include <sys/types.h> /* for u_int */ + + __BEGIN_DECLS + int sysctl(const int *, u_int, void *, size_t *, const void *, size_t); diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild index 51e00d7ccd07..74784293c680 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.34 2012/05/25 15:14:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.35 2012/05/25 15:51:04 aballier Exp $ EAPI=2 @@ -165,6 +165,7 @@ src_prepare() { # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it # shouldn't be a symlink to /usr/src/sys (which should be already patched) epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch + epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch # Preinstall includes so we don't use the system's ones. mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper" install_includes "/include_proper" |