| diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.172.orig/configure.in LVM2.2.02.172/configure.in |
| --- LVM2.2.02.172.orig/configure.in 2017-06-28 08:54:27.000000000 -0700 |
| +++ LVM2.2.02.172/configure.in 2017-07-09 14:58:11.933777531 -0700 |
| @@ -1324,6 +1324,7 @@ |
| PKG_CHECK_MODULES(BLKID, blkid >= 2.24, |
| [ BLKID_WIPING=yes |
| BLKID_PC="blkid" |
| + BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` |
| 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 |
| @@ -1372,6 +1373,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.]) |
| |
| AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1, |
| @@ -1653,19 +1655,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 |
| |
| ################################################################################ |
| @@ -2011,6 +2026,7 @@ |
| ################################################################################ |
| AC_SUBST(APPLIB) |
| AC_SUBST(AWK) |
| +AC_SUBST(BLKID_STATIC_LIBS) |
| AC_SUBST(BLKID_PC) |
| AC_SUBST(BUILD_CMIRRORD) |
| AC_SUBST(BUILD_DMEVENTD) |
| @@ -2125,6 +2141,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) |
| @@ -2140,6 +2157,7 @@ |
| AC_SUBST(CACHE_DUMP_CMD) |
| AC_SUBST(CACHE_REPAIR_CMD) |
| AC_SUBST(CACHE_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.172.orig/make.tmpl.in LVM2.2.02.172/make.tmpl.in |
| --- LVM2.2.02.172.orig/make.tmpl.in 2017-06-28 08:54:28.000000000 -0700 |
| +++ LVM2.2.02.172/make.tmpl.in 2017-07-09 14:56:38.262933483 -0700 |
| @@ -53,7 +53,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 ?= @COPTIMISE_FLAG@ @CFLAGS@ |
| @@ -68,10 +68,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@ |
| VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ |
| TESTING = @TESTING@ |
| |
