From cbf1cd6e78ddaa5ac07a2ce681dadcbe2ecbd731 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 28 Mar 2017 07:43:39 +0200 Subject: lvm: fix cross-compile on Darwin --- package/lvm/Makefile | 2 +- package/lvm/patches/patch-Makefile_in | 20 +++++++++++ package/lvm/patches/patch-conf_Makefile_in | 23 ++++++++++++ package/lvm/patches/patch-configure_in | 45 ++++++++++++++++++++++++ package/lvm/patches/patch-lib_mm_memlock_c | 12 +++---- package/lvm/patches/patch-libdm_Makefile_in | 39 +++++++++++++++++---- package/lvm/patches/patch-make_tmpl_in | 28 +++++++++++++++ package/lvm/patches/patch-scripts_Makefile_in | 12 +++++++ package/lvm/patches/patch-tools_Makefile_in | 50 +++++++++++++++++++++++++++ package/lvm/patches/patch-tools_lvmcmdline_c | 10 +++--- 10 files changed, 222 insertions(+), 19 deletions(-) create mode 100644 package/lvm/patches/patch-Makefile_in create mode 100644 package/lvm/patches/patch-conf_Makefile_in create mode 100644 package/lvm/patches/patch-configure_in create mode 100644 package/lvm/patches/patch-make_tmpl_in create mode 100644 package/lvm/patches/patch-scripts_Makefile_in create mode 100644 package/lvm/patches/patch-tools_Makefile_in (limited to 'package/lvm') diff --git a/package/lvm/Makefile b/package/lvm/Makefile index a2f63f7d4..b05226720 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lvm PKG_VERSION:= 2.02.168 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 23a3d1cddd41b3ef51812ebf83e9fa491f502fe74130d4263be327a91914660d PKG_DESCR:= logical volume management PKG_SECTION:= sys/fs diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in new file mode 100644 index 000000000..81729e780 --- /dev/null +++ b/package/lvm/patches/patch-Makefile_in @@ -0,0 +1,20 @@ +--- LVM2.2.02.168.orig/Makefile.in 2016-12-01 00:17:28.000000000 +0100 ++++ LVM2.2.02.168/Makefile.in 2017-03-27 20:43:17.000000000 +0200 +@@ -18,7 +18,7 @@ top_builddir = @top_builddir@ + abs_top_builddir = @abs_top_builddir@ + abs_top_srcdir = @abs_top_srcdir@ + +-SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools ++SUBDIRS = conf daemons include lib libdaemon libdm scripts tools + + ifeq ("@UDEV_RULES@", "yes") + SUBDIRS += udev +@@ -67,7 +67,7 @@ liblvm.device-mapper: include.device-map + daemons.device-mapper: libdm.device-mapper + tools.device-mapper: libdm.device-mapper + scripts.device-mapper: include.device-mapper +-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper ++device-mapper: tools.device-mapper daemons.device-mapper + + ifeq ("@INTL@", "yes") + lib.pofile: include.pofile diff --git a/package/lvm/patches/patch-conf_Makefile_in b/package/lvm/patches/patch-conf_Makefile_in new file mode 100644 index 000000000..5b910dba7 --- /dev/null +++ b/package/lvm/patches/patch-conf_Makefile_in @@ -0,0 +1,23 @@ +--- LVM2.2.02.168.orig/conf/Makefile.in 2016-12-01 00:17:28.000000000 +0100 ++++ LVM2.2.02.168/conf/Makefile.in 2017-03-27 19:47:20.000000000 +0200 +@@ -37,14 +37,16 @@ generate: + + install_conf: $(CONFSRC) + @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ +- echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \ +- $(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \ ++ echo "$(INSTALL_WDATA) $< $(confdir)/$(CONFDEST)"; \ ++ $(INSTALL_DIR) $(confdir); \ ++ $(INSTALL_WDATA) $< $(confdir)/$(CONFDEST); \ + fi + + install_localconf: $(CONFLOCAL) + @if [ ! -e $(confdir)/$(CONFLOCAL) ]; then \ +- echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFLOCAL)"; \ +- $(INSTALL_WDATA) -D $< $(confdir)/$(CONFLOCAL); \ ++ echo "$(INSTALL_WDATA) $< $(confdir)/$(CONFLOCAL)"; \ ++ $(INSTALL_DIR) $(confdir); \ ++ $(INSTALL_WDATA) $< $(confdir)/$(CONFLOCAL); \ + fi + + install_profiles: $(PROFILES) diff --git a/package/lvm/patches/patch-configure_in b/package/lvm/patches/patch-configure_in new file mode 100644 index 000000000..6e1148c11 --- /dev/null +++ b/package/lvm/patches/patch-configure_in @@ -0,0 +1,45 @@ +--- LVM2.2.02.168.orig/configure.in 2016-12-01 00:17:28.000000000 +0100 ++++ LVM2.2.02.168/configure.in 2017-03-26 19:18:57.000000000 +0200 +@@ -28,7 +28,7 @@ AC_CANONICAL_TARGET([]) + + AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) + case "$host_os" in +- linux*) ++ *) + CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" + ELDFLAGS="-Wl,--export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym +@@ -48,21 +48,6 @@ case "$host_os" in + FSADM=yes + BLKDEACTIVATE=yes + ;; +- darwin*) +- CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" +- CLDFLAGS="$CLDFLAGS" +- ELDFLAGS= +- CLDWHOLEARCHIVE="-all_load" +- CLDNOWHOLEARCHIVE= +- LIB_SUFFIX=dylib +- DEVMAPPER=yes +- ODIRECT=no +- DM_IOCTLS=no +- SELINUX=no +- CLUSTER=none +- FSADM=no +- BLKDEACTIVATE=no +- ;; + esac + + ################################################################################ +@@ -106,10 +91,8 @@ AC_CHECK_HEADERS([assert.h ctype.h diren + AC_CHECK_HEADERS(termios.h sys/statvfs.h sys/timerfd.h linux/magic.h linux/fiemap.h) + + case "$host_os" in +- linux*) ++ *) + AC_CHECK_HEADERS(asm/byteorder.h linux/fs.h malloc.h,,AC_MSG_ERROR(bailing out)) ;; +- darwin*) +- AC_CHECK_HEADERS(machine/endian.h sys/disk.h,,AC_MSG_ERROR(bailing out)) ;; + esac + + ################################################################################ diff --git a/package/lvm/patches/patch-lib_mm_memlock_c b/package/lvm/patches/patch-lib_mm_memlock_c index 8cc6d8514..bfbc8910d 100644 --- a/package/lvm/patches/patch-lib_mm_memlock_c +++ b/package/lvm/patches/patch-lib_mm_memlock_c @@ -1,14 +1,14 @@ ---- LVM2.2.02.114.orig/lib/mm/memlock.c 2014-11-29 00:07:42.000000000 +0100 -+++ LVM2.2.02.114/lib/mm/memlock.c 2015-02-28 09:44:51.000000000 +0100 +--- LVM2.2.02.168.orig/lib/mm/memlock.c 2016-12-01 00:17:29.000000000 +0100 ++++ LVM2.2.02.168/lib/mm/memlock.c 2017-03-26 19:05:36.000000000 +0200 @@ -25,7 +25,6 @@ #include #include #include -#include - #ifndef DEVMAPPER_SUPPORT - -@@ -134,10 +133,8 @@ static void _touch_memory(void *mem, siz + #ifdef HAVE_VALGRIND + #include +@@ -151,10 +150,8 @@ static void _touch_memory(void *mem, siz static void _allocate_memory(void) { #ifndef VALGRIND_POOL @@ -20,7 +20,7 @@ /* Check if we could preallocate requested stack */ if ((getrlimit (RLIMIT_STACK, &limit) == 0) && -@@ -146,50 +143,13 @@ static void _allocate_memory(void) +@@ -163,50 +160,13 @@ static void _allocate_memory(void) _touch_memory(stack_mem, _size_stack); /* FIXME else warn user setting got ignored */ diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in index 2f1ade6c4..4943fab06 100644 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -1,8 +1,8 @@ ---- LVM2.2.02.106.orig/libdm/Makefile.in 2014-04-10 17:38:45.000000000 +0200 -+++ LVM2.2.02.106/libdm/Makefile.in 2014-05-24 12:42:42.819190264 +0200 -@@ -39,10 +39,7 @@ INCLUDES += @VALGRIND_CFLAGS@ - endif - CFLAGS += $(UDEV_CFLAGS) +--- LVM2.2.02.168.orig/libdm/Makefile.in 2016-12-01 00:17:30.000000000 +0100 ++++ LVM2.2.02.168/libdm/Makefile.in 2017-03-27 20:24:52.000000000 +0200 +@@ -38,10 +38,7 @@ SOURCES =\ + + INCLUDES = -I$(srcdir)/$(interface) -ifeq ("@STATIC_LINK@", "yes") LIB_STATIC = $(interface)/libdevmapper.a @@ -10,8 +10,8 @@ - LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) LIB_VERSION = $(LIB_VERSION_DM) - TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) -@@ -71,9 +68,7 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper. + TARGETS = libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) +@@ -69,9 +66,7 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper. INSTALL_TYPE = install_dynamic @@ -22,3 +22,28 @@ ifeq ("@PKGCONFIG@", "yes") INSTALL_TYPE += install_pkgconfig +@@ -82,7 +77,8 @@ install: $(INSTALL_TYPE) install_include + install_device-mapper: install + + install_include: $(srcdir)/libdevmapper.h +- $(INSTALL_DATA) -D $< $(includedir)/$(