Source: lvm2
Version: 2.03.09-3
Tags: patch upstream
User: [email protected]
Usertags: ftcbfs
lvm2 fails to cross build from source, because it hard codes the build
architecture pkg-config in a few places. Please consider applying the
attached patch to always use the correctly detected host architecture
pkg-config. After applying it, lvm2 becomes cross buildable.
Helmut
--- lvm2-2.03.09.orig/configure.ac
+++ lvm2-2.03.09/configure.ac
@@ -1288,8 +1288,8 @@
dnl -- Check for selinux
if test "$SELINUX" = yes; then
AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
- SELINUX_LIBS="$(pkg-config --libs libselinux)"
- SELINUX_LIBS_STATIC="$(pkg-config --libs --static libselinux)"
+ SELINUX_LIBS="$($PKG_CONFIG --libs libselinux)"
+ SELINUX_LIBS_STATIC="$($PKG_CONFIG --libs --static libselinux)"
fi
################################################################################
@@ -1551,6 +1551,9 @@
AC_MSG_RESULT($interface)
################################################################################
+PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[HAVE_LIBSYSTEMD=yes],[HAVE_LIBSYSTEMD=no])
+
+################################################################################
read DM_LIB_VERSION < "$srcdir"/VERSION_DM 2>/dev/null || DM_LIB_VERSION=Unknown
AC_DEFINE_UNQUOTED(DM_LIB_VERSION, "$DM_LIB_VERSION", [Library version])
@@ -1625,6 +1628,7 @@
AC_SUBST(FSADM_PATH)
AC_SUBST(BLKDEACTIVATE)
AC_SUBST(HAVE_LIBDL)
+AC_SUBST(HAVE_LIBSYSTEMD)
AC_SUBST(HAVE_REALTIME)
AC_SUBST(HAVE_VALGRIND)
AC_SUBST(INTL)
--- lvm2-2.03.09.orig/daemons/lvmlockd/Makefile.in
+++ lvm2-2.03.09/daemons/lvmlockd/Makefile.in
@@ -15,8 +15,6 @@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
-USE_SD_NOTIFY=yes
-
SOURCES = lvmlockd-core.c
ifeq ("@BUILD_LOCKDSANLOCK@", "yes")
@@ -44,9 +42,9 @@
LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS)
-ifeq ($(USE_SD_NOTIFY),yes)
- CFLAGS += $(shell pkg-config --cflags libsystemd) -DUSE_SD_NOTIFY
- LIBS += $(shell pkg-config --libs libsystemd)
+ifeq ($(HAVE_LIBSYSTEMD),yes)
+ CFLAGS += $(LIBSYSTEMD_CFLAGS) -DUSE_SD_NOTIFY
+ LIBS += $(LIBSYSTEMD_LIBS)
endif
lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
--- lvm2-2.03.09.orig/make.tmpl.in
+++ lvm2-2.03.09/make.tmpl.in
@@ -75,6 +75,8 @@
BLKID_LIBS = @BLKID_LIBS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
+LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
+LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
USE_TRACKING = @USE_TRACKING@
# Setup directory variables
