summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-01-03 21:18:58 +0000
committerFabian Groffen <grobian@gentoo.org>2011-01-03 21:18:58 +0000
commit602c1735bf48e2428747d6d95e0e6e696b75a22c (patch)
tree2c7098f1e8eaa5add618ffe4fa828f3797ae4d03 /sys-fs/e2fsprogs/files
parentRemoved RESTRICT=mirror since there is no reason for it (diff)
downloadgentoo-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/e2fsprogs/files')
-rw-r--r--sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch43
1 files changed, 43 insertions, 0 deletions
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