robbat2 14/07/16 00:28:28 Added: lvm2-2.02.107-static-pkgconfig-libs.patch Log: Bump per bug #516604. (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.1 sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch?rev=1.1&content-type=text/plain Index: lvm2-2.02.107-static-pkgconfig-libs.patch =================================================================== diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/configure.in LVM2.2.02.107/configure.in --- LVM2.2.02.107.orig/configure.in 2014-07-15 12:57:55.867439868 -0700 +++ LVM2.2.02.107/configure.in 2014-07-15 17:24:02.662666091 -0700 @@ -997,6 +997,7 @@ fi]) if test "$BLKID_WIPING" = yes; then BLKID_PC="blkid" + BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) fi fi @@ -1022,6 +1023,7 @@ if test "$UDEV_SYNC" = yes; then pkg_config_init PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) + UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) fi @@ -1242,19 +1244,32 @@ 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.]) - SELINUX_LIBS="-lsepol"]) + SEPOL_LIBS="-lsepol"]) + + dnl -- init pkgconfig if required + if test x$PKGCONFIG_INIT != x1; then + pkg_config_init + fi + PKG_CHECK_MODULES(SELINUX, libselinux, [ + SELINUX_PC="libselinux" + SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` + SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" + AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) + ],[ + dnl -- old non-pkgconfig method, is buggy with static builds AC_CHECK_LIB([selinux], [is_selinux_enabled], [ AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) AC_CHECK_HEADERS([selinux/label.h]) AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) - SELINUX_LIBS="-lselinux $SELINUX_LIBS" + SELINUX_LIBS="-lselinux $SEPOL_LIBS" SELINUX_PC="libselinux" HAVE_SELINUX=yes ], [ AC_MSG_WARN(Disabling selinux) SELINUX_LIBS= SELINUX_PC= HAVE_SELINUX=no ]) + ]) fi ################################################################################ @@ -1556,6 +1571,7 @@ ################################################################################ AC_SUBST(APPLIB) AC_SUBST(AWK) +AC_SUBST(BLKID_STATIC_LIBS) AC_SUBST(BLKID_PC) AC_SUBST(BLKID_WIPING) AC_SUBST(BUILD_CMIRRORD) @@ -1651,6 +1667,7 @@ AC_SUBST(SALCK_CFLAGS) AC_SUBST(SALCK_LIBS) AC_SUBST(SELINUX_LIBS) +AC_SUBST(SELINUX_STATIC_LIBS) AC_SUBST(SELINUX_PC) AC_SUBST(SNAPSHOTS) AC_SUBST(STATICDIR) @@ -1662,6 +1679,7 @@ AC_SUBST(THIN_DUMP_CMD) AC_SUBST(THIN_REPAIR_CMD) AC_SUBST(THIN_RESTORE_CMD) +AC_SUBST(UDEV_STATIC_LIBS) AC_SUBST(UDEV_PC) AC_SUBST(UDEV_RULES) AC_SUBST(UDEV_SYNC) diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/make.tmpl.in LVM2.2.02.107/make.tmpl.in --- LVM2.2.02.107.orig/make.tmpl.in 2014-07-15 12:57:55.868439884 -0700 +++ LVM2.2.02.107/make.tmpl.in 2014-07-15 17:23:24.060055838 -0700 @@ -44,7 +44,7 @@ LIBS = @LIBS@ # Extra libraries always linked with static binaries -STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) +STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) DEFS += @DEFS@ # FIXME set this only where it's needed, not globally? CFLAGS += @CFLAGS@ @@ -59,10 +59,13 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ READLINE_LIBS = @READLINE_LIBS@ SELINUX_LIBS = @SELINUX_LIBS@ +SELINUX_STATIC_LIBS = @SELINUX_STATIC_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@ TESTING = @TESTING@ # Setup directory variables
