Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/e2fsprogs/files: e2fsprogs-1.41.12-mint-blkid.patch
Date: Mon, 03 Jan 2011 21:19:13
Message-Id: 20110103211858.CA9872005C@flycatcher.gentoo.org
1 grobian 11/01/03 21:18:58
2
3 Added: e2fsprogs-1.41.12-mint-blkid.patch
4 Log:
5 Update mint blkid patch, bug #350342 by Alan Hourihane
6
7 (Portage version: 2.2.01.17555-prefix/cvs/Darwin powerpc)
8
9 Revision Changes Path
10 1.1 sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch?rev=1.1&content-type=text/plain
14
15 Index: e2fsprogs-1.41.12-mint-blkid.patch
16 ===================================================================
17 http://bugs.gentoo.org/276055
18
19 <alanh@×××××××××××.uk>:
20 The configure test program links against libblkid to test. This works
21 fine on shared library systems as libblkid automatically depends on
22 libuuid. But on static systems it needs explicit linking.
23
24
25 --- configure.in
26 +++ configure.in
27 @@ -398,8 +398,8 @@
28 fi
29
30 AC_CHECK_LIB(blkid, blkid_get_cache,
31 - [LIBBLKID=`$PKG_CONFIG --libs blkid`;
32 - STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
33 + [LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
34 + STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`],
35 [AC_MSG_ERROR([external blkid library not found])],
36 [$LIBBLKID])
37 BLKID_CMT=#
38 --- configure.old 2011-01-01 14:20:07.000000000 +0000
39 +++ configure 2011-01-01 14:22:01.000000000 +0000
40 @@ -5228,7 +5228,7 @@
41 $as_echo_n "(cached) " >&6
42 else
43 ac_check_lib_save_LIBS=$LIBS
44 -LIBS="-lblkid $LIBBLKID $LIBS"
45 +LIBS="-lblkid -luuid $LIBBLKID $LIBS"
46 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
47 /* end confdefs.h. */
48
49 @@ -5259,8 +5259,8 @@
50 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
51 $as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; }
52 if test "x$ac_cv_lib_blkid_blkid_get_cache" = x""yes; then :
53 - LIBBLKID=`$PKG_CONFIG --libs blkid`;
54 - STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`
55 + LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
56 + STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`
57 else
58 as_fn_error "external blkid library not found" "$LINENO" 5
59 fi