diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-02-23 04:24:22 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-02-23 04:24:22 +0000 |
commit | 85f938dbfb9763f72b85b69851a7f86cc1e8f938 (patch) | |
tree | 1ad0efa0f9df8fefca4293e677aace1856515840 | |
parent | Fix build error on some systems #206841 by Markus Duft. (diff) | |
download | gentoo-2-85f938dbfb9763f72b85b69851a7f86cc1e8f938.tar.gz gentoo-2-85f938dbfb9763f72b85b69851a7f86cc1e8f938.tar.bz2 gentoo-2-85f938dbfb9763f72b85b69851a7f86cc1e8f938.zip |
old
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-2.7.11-no-compress-docs.patch | 23 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-2.8.11-kern-types.patch | 44 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-2.9.3-pthreads.patch | 69 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild | 65 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild | 61 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild | 64 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-2.9.3.ebuild | 60 |
7 files changed, 0 insertions, 386 deletions
diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.7.11-no-compress-docs.patch b/sys-fs/xfsprogs/files/xfsprogs-2.7.11-no-compress-docs.patch deleted file mode 100644 index 17569052a20f..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-2.7.11-no-compress-docs.patch +++ /dev/null @@ -1,23 +0,0 @@ -let portage compress CHANGES - ---- doc/Makefile -+++ doc/Makefile -@@ -8,16 +8,13 @@ - LSRCFILES = INSTALL PORTING CHANGES COPYING CREDITS - LDIRT = *.gz - --default: CHANGES.gz -+default: - - include $(BUILDRULES) - --CHANGES.gz: -- $(ZIP) --best -c < CHANGES > $@ -- - install: default - $(INSTALL) -m 755 -d $(PKG_DOC_DIR) -- $(INSTALL) -m 644 PORTING CHANGES.gz CREDITS $(PKG_DOC_DIR) -+ $(INSTALL) -m 644 PORTING CHANGES CREDITS $(PKG_DOC_DIR) - ifeq ($(PKG_DISTRIBUTION), debian) - $(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz - else diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.8.11-kern-types.patch b/sys-fs/xfsprogs/files/xfsprogs-2.8.11-kern-types.patch deleted file mode 100644 index 1f3992b76db9..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-2.8.11-kern-types.patch +++ /dev/null @@ -1,44 +0,0 @@ -http://bugs.gentoo.org/131483 -http://oss.sgi.com/bugzilla/show_bug.cgi?id=707 - -=========================================================================== -Index: xfsprogs/configure.in -=========================================================================== - ---- a/xfsprogs/configure.in 2006-09-26 11:14:51.000000000 +1000 -+++ b/xfsprogs/configure.in 2006-09-26 11:14:51.000000000 +1000 -@@ -57,6 +57,7 @@ AC_HAVE_GETMNTINFO - - AC_TYPE_PSINT - AC_TYPE_PSUNSIGNED -+AC_CHECK_TYPES(__u32,,,[#include <asm/types.h>]) - AC_SIZEOF_POINTERS_AND_LONG - AC_MANUAL_FORMAT - - -=========================================================================== -Index: xfsprogs/include/platform_defs.h.in -=========================================================================== - ---- a/xfsprogs/include/platform_defs.h.in 2006-09-26 11:14:52.000000000 +1000 -+++ b/xfsprogs/include/platform_defs.h.in 2006-09-26 11:14:52.000000000 +1000 -@@ -31,6 +31,10 @@ - #include <unistd.h> - #include <sys/types.h> - -+#undef HAVE___U32 -+#ifdef HAVE___U32 -+#include <asm/types.h> -+#else - typedef unsigned char __u8; - typedef signed char __s8; - typedef unsigned short __u16; -@@ -39,6 +43,7 @@ typedef unsigned int __u32; - typedef signed int __s32; - typedef unsigned long long int __u64; - typedef signed long long int __s64; -+#endif - - typedef __u16 __be16; - typedef __u32 __be32; - diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.9.3-pthreads.patch b/sys-fs/xfsprogs/files/xfsprogs-2.9.3-pthreads.patch deleted file mode 100644 index 75f22c0b73c7..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-2.9.3-pthreads.patch +++ /dev/null @@ -1,69 +0,0 @@ -http://bugs.gentoo.org/190523 -http://oss.sgi.com/bugzilla/show_bug.cgi?id=766 - ---- db/Makefile -+++ db/Makefile -@@ -16,7 +16,7 @@ - attrset.h - CFILES = $(HFILES:.h=.c) - LSRCFILES = xfs_admin.sh xfs_check.sh xfs_ncheck.sh xfs_metadump.sh --LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) -+LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) - LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) - LLDFLAGS += -static - ---- growfs/Makefile -+++ growfs/Makefile -@@ -9,7 +9,7 @@ - - CFILES = xfs_growfs.c - --LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBUUID) $(LIBRT) -+LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) - LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD) - LLDFLAGS = -static - LSRCFILES = xfs_info.sh ---- logprint/Makefile -+++ logprint/Makefile -@@ -12,7 +12,7 @@ - log_copy.c log_dump.c log_misc.c \ - log_print_all.c log_print_trans.c - --LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) -+LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) - LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) - LLDFLAGS = -static - ---- mdrestore/Makefile -+++ mdrestore/Makefile -@@ -8,7 +8,7 @@ - LTCOMMAND = xfs_mdrestore - CFILES = xfs_mdrestore.c - --LLDLIBS = $(LIBXFS) $(LIBRT) -+LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) - LTDEPENDENCIES = $(LIBXFS) - LLDFLAGS = -static - ---- mkfs/Makefile -+++ mkfs/Makefile -@@ -11,7 +11,7 @@ - HFILES = xfs_mkfs.h - CFILES = maxtrres.c proto.c xfs_mkfs.c - --LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBDISK) $(LIBRT) -+LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBDISK) $(LIBRT) $(LIBPTHREAD) - LTDEPENDENCIES = $(LIBXFS) $(LIBDISK) - LLDFLAGS = -static - ---- quota/Makefile -+++ quota/Makefile -@@ -14,7 +14,7 @@ - PCFILES = darwin.c freebsd.c irix.c linux.c - LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g") - --LLDLIBS = $(LIBXCMD) -+LLDLIBS = $(LIBXCMD) $(LIBPTHREAD) - LTDEPENDENCIES = $(LIBXCMD) - LLDFLAGS = -static - diff --git a/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild b/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild deleted file mode 100644 index 427515c6bad4..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.11.ebuild,v 1.11 2007/02/13 11:28:32 vapier Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" -inherit flag-o-matic eutils autotools toolchain-funcs - -MY_P="${PN}_${PV}-1" -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sh ~sparc x86" -IUSE="nls" - -RDEPEND="sys-fs/e2fsprogs" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-kern-types.patch #131483 - epatch "${FILESDIR}"/${PN}-2.7.11-no-compress-docs.patch #129486 - # Inject our own CFLAGS / docpath - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - -e '/^GCFLAGS/s:-O1::' \ - include/builddefs.in \ - || die "sed include/builddefs.in failed" - # make sure the PLATFORM envvar doesn't break crap - sed -i -e '/PLATFORM/d' configure.in || die "sed PLATFORM" - # We'll handle /lib versus /usr/lib install - sed -i -e '/INSTALL.* -S .*LIBNAME/d' \ - include/buildmacros || die "sed symlinks" - eautoconf -} - -src_compile() { - export OPTIMIZER=${CFLAGS} - export DEBUG=-DNDEBUG - - econf \ - --bindir=/usr/bin \ - --sbindir=/sbin \ - --libexecdir=/usr/$(get_libdir) \ - $(use_enable nls gettext) \ - || die "config failed" - emake || die -} - -src_install() { - make DIST_ROOT="${D}" install install-dev || die "make install failed" - - # shared in /lib, static in /usr/lib, ldscript fun too - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ - dosym libhandle.so.1 /$(get_libdir)/libhandle.so - gen_usr_ldscript libhandle.so - - prepalldocs -} diff --git a/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild b/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild deleted file mode 100644 index ddd299fa9371..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.18.ebuild,v 1.2 2007/02/14 15:40:33 vapier Exp $ - -inherit eutils toolchain-funcs - -MY_P="${PN}_${PV}-1" -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="nls" - -RDEPEND="sys-fs/e2fsprogs" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-symlinks.patch #166729 - # Inject our own CFLAGS / docpath - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - -e '/^GCFLAGS/s:-O1::' \ - include/builddefs.in \ - || die "sed include/builddefs.in failed" - # make sure the PLATFORM envvar doesn't break crap - sed -i -e '/PLATFORM/d' configure || die "sed PLATFORM" - # We'll handle /lib versus /usr/lib install - sed -i -e '/INSTALL.* -S .*LIBNAME/d' \ - include/buildmacros || die "sed symlinks" -} - -src_compile() { - export OPTIMIZER=${CFLAGS} - export DEBUG=-DNDEBUG - - econf \ - --bindir=/usr/bin \ - --sbindir=/sbin \ - --libexecdir=/usr/$(get_libdir) \ - $(use_enable nls gettext) \ - || die "config failed" - emake || die -} - -src_install() { - emake DIST_ROOT="${D}" install install-dev || die "make install failed" - - # shared in /lib, static in /usr/lib, ldscript fun too - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ - dosym libhandle.so.1 /$(get_libdir)/libhandle.so - gen_usr_ldscript libhandle.so - - prepalldocs -} diff --git a/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild b/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild deleted file mode 100644 index a63524b5566f..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild,v 1.3 2007/06/13 23:41:20 vapier Exp $ - -inherit eutils toolchain-funcs autotools - -MY_P="${PN}_${PV}-1" -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="nls" - -RDEPEND="sys-fs/e2fsprogs" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-2.8.18-symlinks.patch #166729 - epatch "${FILESDIR}"/${PN}-2.8.21-LDFLAGS.patch - epatch "${FILESDIR}"/${P}-kern-types.patch #131483 - # Inject our own CFLAGS / docpath - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - -e '/^GCFLAGS/s:-O1::' \ - include/builddefs.in \ - || die "sed include/builddefs.in failed" - # make sure the PLATFORM envvar doesn't break crap - sed -i -e '/PLATFORM/d' configure || die "sed PLATFORM" - # We'll handle /lib versus /usr/lib install - sed -i -e '/INSTALL.* -S .*LIBNAME/d' \ - include/buildmacros || die "sed symlinks" - eautoconf -} - -src_compile() { - export OPTIMIZER=${CFLAGS} - export DEBUG=-DNDEBUG - - econf \ - --bindir=/usr/bin \ - --sbindir=/sbin \ - --libexecdir=/usr/$(get_libdir) \ - $(use_enable nls gettext) \ - || die "config failed" - emake || die -} - -src_install() { - emake DIST_ROOT="${D}" install install-dev || die "make install failed" - - # shared in /lib, static in /usr/lib, ldscript fun too - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ - dosym libhandle.so.1 /$(get_libdir)/libhandle.so - gen_usr_ldscript libhandle.so - - prepalldocs -} diff --git a/sys-fs/xfsprogs/xfsprogs-2.9.3.ebuild b/sys-fs/xfsprogs/xfsprogs-2.9.3.ebuild deleted file mode 100644 index c8ce9bdcf98c..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-2.9.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.9.3.ebuild,v 1.10 2007/12/12 00:01:40 vapier Exp $ - -inherit eutils toolchain-funcs autotools - -MY_P="${PN}_${PV}-1" -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 ~hppa ia64 mips ppc ppc64 sh sparc x86" -IUSE="nls" - -RDEPEND="sys-fs/e2fsprogs" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-2.8.18-symlinks.patch #166729 - epatch "${FILESDIR}"/${PN}-2.8.21-kern-types.patch #131483 - epatch "${FILESDIR}"/${PN}-2.9.3-pthreads.patch #190523 - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in \ - || die "sed include/builddefs.in failed" - # We'll handle /lib versus /usr/lib install - sed -i -e '/INSTALL.* -S .*LIBNAME/d' \ - include/buildmacros || die "sed symlinks" - eautoconf -} - -src_compile() { - export DEBUG=-DNDEBUG - export OPTIMIZER=${CFLAGS} - unset PLATFORM # if set in user env, this breaks configure - econf \ - --bindir=/usr/bin \ - --sbindir=/sbin \ - --libexecdir=/usr/$(get_libdir) \ - $(use_enable nls gettext) \ - || die "config failed" - emake || die -} - -src_install() { - emake DIST_ROOT="${D}" install install-dev || die "make install failed" - - # shared in /lib, static in /usr/lib, ldscript fun too - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ - dosym libhandle.so.1 /$(get_libdir)/libhandle.so - gen_usr_ldscript libhandle.so - - prepalldocs -} |