From: Thomas Petazzoni Date: Mon, 3 Jul 2017 22:02:26 +0000 (+0200) Subject: parted: remove libintl static linking handling X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72b8cb61755b2813a2d572240840b8642664d345;p=buildroot.git parted: remove libintl static linking handling We no longer support building the full-blown libintl in static linking scenarios, as it causes too many problems. Therefore, remove the patch that was handling this. Signed-off-by: Thomas Petazzoni --- diff --git a/package/parted/0003-fix-includes-for-musl.patch b/package/parted/0003-fix-includes-for-musl.patch new file mode 100644 index 0000000000..28c94ace7c --- /dev/null +++ b/package/parted/0003-fix-includes-for-musl.patch @@ -0,0 +1,18 @@ +Include to get loff_t definition + +Patch borrowed from Alpine Linux at +http://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch. Solves +build with musl. + +Signed-off-by: Thomas Petazzoni + +--- parted-3.1.orig/libparted/fs/xfs/platform_defs.h ++++ parted-3.1/libparted/fs/xfs/platform_defs.h +@@ -35,6 +35,7 @@ + #define __XFS_PLATFORM_DEFS_H__ + + #include ++#include + #include + #include + #include diff --git a/package/parted/0003-fix-static-link-uuid.patch b/package/parted/0003-fix-static-link-uuid.patch deleted file mode 100644 index d6ec2cf365..0000000000 --- a/package/parted/0003-fix-static-link-uuid.patch +++ /dev/null @@ -1,48 +0,0 @@ -configure: use pkg-config to find libuuid - -In some conditions, libuuid may be linked with -lintl. This can be the -case on uClibc when locales are enabled. - -When doing a shared link, this dependency is automatically pulled in via -a DT_NEEDED ELF tag - -For a static link, there is no such mechanism to pull in dependent -libraries. - -Currently, the check for libuuid is done with AC_CHECK_LIB, but this -does not handle dependencies, and thus a stattic build fails. - -Use pkg-config to find libuuid, that automatically pulls in the -dependencies of libuuid, if any. - -Signed-off-by: "Yann E. MORIN" - ---- -Note: of course, that relies on the fact that libuuid installs a proper -.pc file; a patch will be submitted upstream shortly. - -But even considering the current situation, where libuuid does not -provide a proper .pc file (yet), this patch does not change the -behaviour we've had so far; it is a bet on the future! ;-) - -diff -durN parted-3.1.orig/configure.ac parted-3.1/configure.ac ---- parted-3.1.orig/configure.ac 2014-11-29 16:27:49.520560137 +0100 -+++ parted-3.1/configure.ac 2014-11-29 16:32:50.799702049 +0100 -@@ -313,16 +313,7 @@ - AC_SUBST([DL_LIBS]) - - dnl Check for libuuid --UUID_LIBS="" --AC_CHECK_LIB([uuid], [uuid_generate], [UUID_LIBS="-luuid"], -- [AC_MSG_ERROR(dnl --[GNU Parted requires libuuid - a part of the util-linux-ng package (but --usually distributed separately in libuuid-devel, uuid-dev or similar) --This can probably be found on your distribution's CD or FTP site or at: -- http://userweb.kernel.org/~kzak/util-linux-ng/ --Note: originally, libuuid was part of the e2fsprogs package. Later, it --moved to util-linux-ng-2.16, and that package is now the preferred source.])]) --AC_SUBST([UUID_LIBS]) -+PKG_CHECK_MODULES([UUID],[uuid]) - - dnl Check for libdevmapper - DM_LIBS= diff --git a/package/parted/0004-fix-includes-for-musl.patch b/package/parted/0004-fix-includes-for-musl.patch deleted file mode 100644 index 28c94ace7c..0000000000 --- a/package/parted/0004-fix-includes-for-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -Include to get loff_t definition - -Patch borrowed from Alpine Linux at -http://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch. Solves -build with musl. - -Signed-off-by: Thomas Petazzoni - ---- parted-3.1.orig/libparted/fs/xfs/platform_defs.h -+++ parted-3.1/libparted/fs/xfs/platform_defs.h -@@ -35,6 +35,7 @@ - #define __XFS_PLATFORM_DEFS_H__ - - #include -+#include - #include - #include - #include