diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-24 13:06:45 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-24 13:07:48 +0200 |
| commit | 578f218b3e26821afc408681613c0320f9dfe2bc (patch) | |
| tree | f6b8d773cee0025279168b33ccf36f57eaa9b1f8 /package/lvm | |
| parent | 0151f5cf9e52868c1e0e20d8a048c028af9e7166 (diff) | |
fix lvm package compile
Diffstat (limited to 'package/lvm')
| -rw-r--r-- | package/lvm/Makefile | 3 | ||||
| -rw-r--r-- | package/lvm/patches/patch-libdm_Makefile_in | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 401855955..aa3f5eca8 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -5,11 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm PKG_VERSION:= 2.02.106 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 77f84279fb649b3dc4edad1c6d1a1b0e PKG_DESCR:= logical volume management PKG_SECTION:= fs PKG_DEPENDS:= libdevmapper libncurses +PKG_BUILDDEP:= ncurses util-linux PKG_URL:= http://sourceware.org/lvm2/ PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/ PKG_LIBNAME:= libdevmapper diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in new file mode 100644 index 000000000..2f1ade6c4 --- /dev/null +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -0,0 +1,24 @@ +--- 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) + +-ifeq ("@STATIC_LINK@", "yes") + LIB_STATIC = $(interface)/libdevmapper.a +-endif +- + 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. + + INSTALL_TYPE = install_dynamic + +-ifeq ("@STATIC_LINK@", "yes") +- INSTALL_TYPE += install_static +-endif ++INSTALL_TYPE += install_static + + ifeq ("@PKGCONFIG@", "yes") + INSTALL_TYPE += install_pkgconfig |