diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2014-06-11 13:15:09 +0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-11 14:53:58 +0200 |
| commit | 98f598a1f439382904745973c56742a9830fad6b (patch) | |
| tree | 57038b286cdf5326e6baddc50d69c467afa1e880 | |
| parent | 11e0d9333ccd1ee50997be2b86c40f7633c7e5f9 (diff) | |
e2fsprogs: fix static build against external libblkid
Fixes:
http://autobuild.buildroot.net/results/0159246b52659508a4bbba4126ab27b28a2b2e2c/
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/e2fsprogs/e2fsprogs-0004-configure.in-fix-external-libblkid-test-for-static-l.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/package/e2fsprogs/e2fsprogs-0004-configure.in-fix-external-libblkid-test-for-static-l.patch b/package/e2fsprogs/e2fsprogs-0004-configure.in-fix-external-libblkid-test-for-static-l.patch new file mode 100644 index 000000000..65d6c4c02 --- /dev/null +++ b/package/e2fsprogs/e2fsprogs-0004-configure.in-fix-external-libblkid-test-for-static-l.patch @@ -0,0 +1,34 @@ +From b52e76432fe23490b891884f3a66504101c2a5bd Mon Sep 17 00:00:00 2001 +Message-Id: <b52e76432fe23490b891884f3a66504101c2a5bd.1402480818.git.baruch@tkos.co.il> +From: Baruch Siach <baruch@tkos.co.il> +Date: Wed, 11 Jun 2014 12:56:15 +0300 +Subject: [PATCH] configure.in: fix external libblkid test for static link + +External libblkid needs -luuid when linking statically. Use pkg-config to +determine it correctly. Adding --static doesn't hurt even for dynamic +linking. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- + +Patch status: sent upstream: http://patchwork.ozlabs.org/patch/358584/ + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 448a2926776a..ec6068320878 100644 +--- a/configure.in ++++ b/configure.in +@@ -551,7 +551,7 @@ then + [LIBBLKID=`$PKG_CONFIG --libs blkid`; + STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`], + [AC_MSG_ERROR([external blkid library not found])], +- [$LIBBLKID]) ++ [`$PKG_CONFIG --static --libs blkid`]) + BLKID_CMT=# + AC_MSG_RESULT([Disabling private blkid library]) + else +-- +2.0.0 + |