diff options
Diffstat (limited to 'sys-fs/lvm2/files')
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch (renamed from sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch) | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch index 083a7327c6a6..e259547a47b0 100644 --- a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch +++ b/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch @@ -1,4 +1,4 @@ -From 88aeb306dfd1e0174bf02cc208d46f0d722204dc Mon Sep 17 00:00:00 2001 +From ac7cce039825ff779795b5c2ae0ecf00ba43a401 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" <robbat2@gentoo.org> Date: Sun, 9 May 2021 11:00:22 +0200 Subject: [PATCH] Use pkgconfig to detect static libs @@ -9,10 +9,10 @@ Subject: [PATCH] Use pkgconfig to detect static libs 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 354b53b5ec..e872d70256 100644 +index 6cdf1a7e65..90452ebf7c 100644 --- a/configure.ac +++ b/configure.ac -@@ -1097,6 +1097,7 @@ if test "$BLKID_WIPING" != no; then +@@ -1168,6 +1168,7 @@ if test "$BLKID_WIPING" != no; then PKG_CHECK_MODULES(BLKID, blkid >= 2.24, [ BLKID_WIPING=yes BLKID_PC="blkid" @@ -20,7 +20,7 @@ index 354b53b5ec..e872d70256 100644 DEFAULT_USE_BLKID_WIPING=1 AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) ], [if test "$BLKID_WIPING" = maybe; then -@@ -1145,6 +1146,7 @@ AC_MSG_RESULT($UDEV_SYNC) +@@ -1213,6 +1214,7 @@ AC_MSG_RESULT($UDEV_SYNC) if test "$UDEV_SYNC" = yes; then pkg_config_init PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) @@ -28,7 +28,7 @@ index 354b53b5ec..e872d70256 100644 AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1, -@@ -1369,19 +1371,30 @@ dnl -- Check for selinux +@@ -1432,19 +1434,30 @@ dnl -- Check for selinux if test "$SELINUX" = yes; then AC_CHECK_LIB([sepol], [sepol_check_context], [ AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) @@ -61,7 +61,7 @@ index 354b53b5ec..e872d70256 100644 fi ################################################################################ -@@ -1755,6 +1768,7 @@ AC_DEFINE_UNQUOTED(LVM_CONFIGURE_LINE, "$CONFIGURE_LINE", [configure command lin +@@ -1834,6 +1847,7 @@ AC_ARG_VAR([UDEV_LIBS], [linker flags for udev]) ################################################################################ AC_SUBST(AWK) AC_SUBST(BLKID_PC) @@ -69,15 +69,15 @@ index 354b53b5ec..e872d70256 100644 AC_SUBST(BUILD_CMIRRORD) AC_SUBST(BUILD_DMEVENTD) AC_SUBST(BUILD_LVMDBUSD) -@@ -1857,6 +1871,7 @@ AC_SUBST(SALCK_LIBS) +@@ -1934,6 +1948,7 @@ AC_SUBST(SALCK_LIBS) AC_SUBST(SBINDIR) AC_SUBST(SELINUX_LIBS) AC_SUBST(SELINUX_PC) +AC_SUBST(SELINUX_STATIC_LIBS) AC_SUBST(SYSCONFDIR) - AC_SUBST(SYSTEMD_LIBS) AC_SUBST(SNAPSHOTS) -@@ -1875,6 +1890,7 @@ AC_SUBST(CACHE_REPAIR_CMD) + AC_SUBST(STATICDIR) +@@ -1950,6 +1965,7 @@ AC_SUBST(CACHE_REPAIR_CMD) AC_SUBST(CACHE_RESTORE_CMD) AC_SUBST(UDEV_PC) AC_SUBST(UDEV_RULES) @@ -86,7 +86,7 @@ index 354b53b5ec..e872d70256 100644 AC_SUBST(UDEV_SYSTEMD_BACKGROUND_JOBS) AC_SUBST(UDEV_RULE_EXEC_DETECTION) diff --git a/make.tmpl.in b/make.tmpl.in -index 99f02e8b77..ae189546d0 100644 +index cccda10d6f..bf6c3e5596 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -64,7 +64,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile @@ -98,20 +98,27 @@ index 99f02e8b77..ae189546d0 100644 DEFS += @DEFS@ # FIXME set this only where it's needed, not globally? CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ -@@ -83,10 +83,13 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ +@@ -82,6 +82,7 @@ AIO_CFLAGS = @AIO_CFLAGS@ + AIO_LIBS = @AIO_LIBS@ + BLKID_CFLAGS = @BLKID_CFLAGS@ + BLKID_LIBS = @BLKID_LIBS@ ++BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ + CPG_CFLAGS = @CPG_CFLAGS@ + CPG_LIBS = @CPG_LIBS@ + EDITLINE_CFLAGS = @EDITLINE_CFLAGS@ +@@ -90,10 +91,12 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ + READLINE_CFLAGS = @READLINE_CFLAGS@ READLINE_LIBS = @READLINE_LIBS@ - EDITLINE_LIBS = @EDITLINE_LIBS@ SELINUX_LIBS = @SELINUX_LIBS@ +SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ + SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ + SYSTEMD_LIBS = @SYSTEMD_LIBS@ UDEV_CFLAGS = @UDEV_CFLAGS@ UDEV_LIBS = @UDEV_LIBS@ +UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ - BLKID_CFLAGS = @BLKID_CFLAGS@ - BLKID_LIBS = @BLKID_LIBS@ -+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ - SYSTEMD_LIBS = @SYSTEMD_LIBS@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ - USE_TRACKING = @USE_TRACKING@ + VALGRIND_LIBS = @VALGRIND_LIBS@ + -- -2.31.1 +2.33.1 |