summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Rothe <corsair@gentoo.org>2007-06-09 15:52:31 +0000
committerMarkus Rothe <corsair@gentoo.org>2007-06-09 15:52:31 +0000
commit9c888729941ffad4e1546f9e6b42c13c2cd57b3d (patch)
treec1245c9261ce6a89d8cea9db1893ac9253a0e02b
parentFix emacs issue, bug#181397, thanks to Andre Kuehne (diff)
downloadgentoo-2-9c888729941ffad4e1546f9e6b42c13c2cd57b3d.tar.gz
gentoo-2-9c888729941ffad4e1546f9e6b42c13c2cd57b3d.tar.bz2
gentoo-2-9c888729941ffad4e1546f9e6b42c13c2cd57b3d.zip
Added patch for bug #131483; upstream fixed the fix ... and broke it
(Portage version: 2.1.2.7)
-rw-r--r--sys-fs/xfsprogs/ChangeLog6
-rw-r--r--sys-fs/xfsprogs/files/xfsprogs-2.8.21-kern-types.patch11
-rw-r--r--sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild6
3 files changed, 20 insertions, 3 deletions
diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index 9afc839c31f5..111b9e650d33 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/xfsprogs
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.64 2007/05/31 06:50:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.65 2007/06/09 15:52:31 corsair Exp $
+
+ 09 Jun 2007; Markus Rothe <corsair@gentoo.org>
+ +files/xfsprogs-2.8.21-kern-types.patch, xfsprogs-2.8.21.ebuild:
+ Added patch for bug #131483; upstream fixed the fix ... and broke it
*xfsprogs-2.8.21 (31 May 2007)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.8.21-kern-types.patch b/sys-fs/xfsprogs/files/xfsprogs-2.8.21-kern-types.patch
new file mode 100644
index 000000000000..dd451ac42153
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-2.8.21-kern-types.patch
@@ -0,0 +1,11 @@
+--- xfsprogs-2.8.21/configure.in.orig 2007-03-16 02:40:23.000000000 +0000
++++ xfsprogs-2.8.21/configure.in 2007-06-09 15:39:09.282258693 +0000
+@@ -57,7 +57,7 @@
+
+ AC_TYPE_PSINT
+ AC_TYPE_PSUNSIGNED
+-AC_TYPE_U32
++AC_CHECK_TYPES(__u32,,,[#include <asm/types.h>])
+ AC_SIZEOF_POINTERS_AND_LONG
+ AC_MANUAL_FORMAT
+
diff --git a/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild b/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild
index 5af0b2ea3fc8..c189e0340443 100644
--- a/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild
@@ -1,8 +1,8 @@
# 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.1 2007/05/31 06:50:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild,v 1.2 2007/06/09 15:52:31 corsair Exp $
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs autotools
MY_P="${PN}_${PV}-1"
DESCRIPTION="xfs filesystem utilities"
@@ -22,6 +22,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${PN}-2.8.18-symlinks.patch #166729
+ epatch "${FILESDIR}"/${P}-kern-types.patch #131483
# Inject our own CFLAGS / docpath
sed -i \
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
@@ -33,6 +34,7 @@ src_unpack() {
# We'll handle /lib versus /usr/lib install
sed -i -e '/INSTALL.* -S .*LIBNAME/d' \
include/buildmacros || die "sed symlinks"
+ eautoconf
}
src_compile() {