diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-06-14 08:57:55 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-06-14 08:57:55 +0000 |
| commit | f41ea4ac25d4015c1b757bc848f6d37bf2c2a4a8 (patch) | |
| tree | b9df78b51cefe3c0a529e0b531ba8c43dc5c0c74 /sys-apps | |
| parent | Stable on ppc wrt bug 222167 (diff) | |
| download | gentoo-2-f41ea4ac25d4015c1b757bc848f6d37bf2c2a4a8.tar.gz gentoo-2-f41ea4ac25d4015c1b757bc848f6d37bf2c2a4a8.tar.bz2 gentoo-2-f41ea4ac25d4015c1b757bc848f6d37bf2c2a4a8.zip | |
Add patch to build with glibc 2.8, fixes bug #225623.
(Portage version: 2.1.5.5)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/mtree/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch | 25 | ||||
| -rw-r--r-- | sys-apps/mtree/mtree-2007.4.ebuild | 11 |
3 files changed, 39 insertions, 3 deletions
diff --git a/sys-apps/mtree/ChangeLog b/sys-apps/mtree/ChangeLog index 05a508992727..aa2ef5a5e6f8 100644 --- a/sys-apps/mtree/ChangeLog +++ b/sys-apps/mtree/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/mtree # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.11 2008/01/27 16:52:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.12 2008/06/14 08:57:54 flameeyes Exp $ + + 14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> + +files/mtree-2007.4+glibc-2.8.patch, mtree-2007.4.ebuild: + Add patch to build with glibc 2.8, fixes bug #225623. 27 Jan 2008; Mike Frysinger <vapier@gentoo.org> mtree-2007.4.ebuild: Add workaround for parallel build failure in libnbcompat with nbtypes.h. diff --git a/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch b/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch new file mode 100644 index 000000000000..998715766f65 --- /dev/null +++ b/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch @@ -0,0 +1,25 @@ +Index: pkgsrc/pkgtools/libnbcompat/files/nbcompat/limits.h +=================================================================== +--- pkgsrc.orig/pkgtools/libnbcompat/files/nbcompat/limits.h ++++ pkgsrc/pkgtools/libnbcompat/files/nbcompat/limits.h +@@ -43,6 +43,11 @@ + # include <limits.h> + #endif + ++/* Needed for glibc 2.8 */ ++#ifdef HAVE_SYS_PARAM_H ++# include <sys/param.h> ++#endif ++ + /* + * Declare functions and macros that may be missing in <limits.h>. + */ +@@ -77,4 +82,8 @@ + # define UID_MAX 2147483647U /* max value for a uid_t (2^31-2) */ + #endif + ++#if !defined(ARG_MAX) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8) ) ++# define ARG_MAX sysconf(_SC_ARG_MAX) ++#endif ++ + #endif /* !_NBCOMPAT_LIMITS_H_ */ diff --git a/sys-apps/mtree/mtree-2007.4.ebuild b/sys-apps/mtree/mtree-2007.4.ebuild index c62e552aded7..5b78cc51c9ce 100644 --- a/sys-apps/mtree/mtree-2007.4.ebuild +++ b/sys-apps/mtree/mtree-2007.4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-2007.4.ebuild,v 1.2 2008/01/27 16:52:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-2007.4.ebuild,v 1.3 2008/06/14 08:57:54 flameeyes Exp $ -inherit flag-o-matic +inherit flag-o-matic eutils MY_PV=${PV/./Q} DESCRIPTION="check the permissions of a file system against a spec file" @@ -16,6 +16,13 @@ IUSE="" S=${WORKDIR}/pkgsrc/pkgtools +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}+glibc-2.8.patch" +} + src_compile() { cd "${S}"/libnbcompat/files econf || die "econf libnbcompat failed" |