diff options
author | Fabian Groffen <grobian@gentoo.org> | 2011-01-03 21:18:58 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2011-01-03 21:18:58 +0000 |
commit | 602c1735bf48e2428747d6d95e0e6e696b75a22c (patch) | |
tree | 2c7098f1e8eaa5add618ffe4fa828f3797ae4d03 /sys-fs | |
parent | Removed RESTRICT=mirror since there is no reason for it (diff) | |
download | gentoo-2-602c1735bf48e2428747d6d95e0e6e696b75a22c.tar.gz gentoo-2-602c1735bf48e2428747d6d95e0e6e696b75a22c.tar.bz2 gentoo-2-602c1735bf48e2428747d6d95e0e6e696b75a22c.zip |
Update mint blkid patch, bug #350342 by Alan Hourihane
(Portage version: 2.2.01.17555-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 9 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild | 6 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild | 6 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch | 43 |
4 files changed, 56 insertions, 8 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index 1fe3effcb1ab..2346d8dd986e 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/e2fsprogs -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.230 2010/12/29 08:15:18 vapier Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.231 2011/01/03 21:18:58 grobian Exp $ + + 03 Jan 2011; Fabian Groffen <grobian@gentoo.org> + e2fsprogs-1.41.12-r1.ebuild, +files/e2fsprogs-1.41.12-mint-blkid.patch, + e2fsprogs-1.41.14.ebuild: + Update mint blkid patch, bug #350342 by Alan Hourihane *e2fsprogs-1.41.14 (29 Dec 2010) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild index 73635ff82057..d9da330fafc0 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild,v 1.4 2010/12/05 14:46:57 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild,v 1.5 2011/01/03 21:18:58 grobian Exp $ EAPI="3" @@ -43,7 +43,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-darwin-makefile.patch if [[ ${CHOST} == *-mint* ]] ; then epatch "${FILESDIR}"/${PN}-1.41-mint.patch - epatch "${FILESDIR}"/${PN}-1.41.7-mint-blkid.patch + epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch fi # blargh ... trick e2fsprogs into using e2fsprogs-libs rm -rf doc diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild index fc5314602388..53a5d455df9d 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild,v 1.1 2010/12/29 08:15:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild,v 1.2 2011/01/03 21:18:58 grobian Exp $ EAPI="3" @@ -43,7 +43,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch if [[ ${CHOST} == *-mint* ]] ; then epatch "${FILESDIR}"/${PN}-1.41-mint.patch - epatch "${FILESDIR}"/${PN}-1.41.7-mint-blkid.patch + epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch fi # blargh ... trick e2fsprogs into using e2fsprogs-libs rm -rf doc diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch new file mode 100644 index 000000000000..886ece5b7199 --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch @@ -0,0 +1,43 @@ +http://bugs.gentoo.org/276055 + +<alanh@fairlite.co.uk>: +The configure test program links against libblkid to test. This works +fine on shared library systems as libblkid automatically depends on +libuuid. But on static systems it needs explicit linking. + + +--- configure.in ++++ configure.in +@@ -398,8 +398,8 @@ + fi + + AC_CHECK_LIB(blkid, blkid_get_cache, +- [LIBBLKID=`$PKG_CONFIG --libs blkid`; +- STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`], ++ [LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`; ++ STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`], + [AC_MSG_ERROR([external blkid library not found])], + [$LIBBLKID]) + BLKID_CMT=# +--- configure.old 2011-01-01 14:20:07.000000000 +0000 ++++ configure 2011-01-01 14:22:01.000000000 +0000 +@@ -5228,7 +5228,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lblkid $LIBBLKID $LIBS" ++LIBS="-lblkid -luuid $LIBBLKID $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -5259,8 +5259,8 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5 + $as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; } + if test "x$ac_cv_lib_blkid_blkid_get_cache" = x""yes; then : +- LIBBLKID=`$PKG_CONFIG --libs blkid`; +- STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid` ++ LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`; ++ STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid` + else + as_fn_error "external blkid library not found" "$LINENO" 5 + fi |