diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 16:19:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 16:19:02 +0200 |
| commit | 0bc52de49b72c721c823042c1920b90887c8e0b1 (patch) | |
| tree | 6320cc008d20be751f19523c1fe6326d574a471f /package/lvm/patches/patch-tools_Makefile_in | |
| parent | acd5d0f4a9b1ed64975968126680f5247691ddba (diff) | |
update to latest upstream
- force building of static libdevmapper library via patch
Diffstat (limited to 'package/lvm/patches/patch-tools_Makefile_in')
| -rw-r--r-- | package/lvm/patches/patch-tools_Makefile_in | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in index ed2a2c974..5dc0235e4 100644 --- a/package/lvm/patches/patch-tools_Makefile_in +++ b/package/lvm/patches/patch-tools_Makefile_in @@ -1,33 +1,24 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- LVM2.2.02.45.orig/tools/Makefile.in 2009-02-17 12:07:59.000000000 +0100 -+++ LVM2.2.02.45/tools/Makefile.in 2009-06-11 23:24:12.000000000 +0200 -@@ -62,19 +62,18 @@ SOURCES =\ - vgscan.c \ - vgsplit.c - --TARGETS =\ -- .commands \ -- lvm -- --INSTALL_LVM_TARGETS = install_tools_dynamic --INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic --INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic -+TARGETS = .commands - - ifeq ("@STATIC_LINK@", "yes") - TARGETS += lvm.static - INSTALL_LVM_TARGETS += install_tools_static - INSTALL_DMSETUP_TARGETS += install_dmsetup_static - INSTALL_CMDLIB_TARGETS += install_cmdlib_static -+else -+ TARGETS += lvm -+ INSTALL_LVM_TARGETS = install_tools_dynamic -+ INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic -+ INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic +--- LVM2.2.02.51.orig/tools/Makefile.in 2009-05-21 13:11:29.000000000 +0200 ++++ LVM2.2.02.51/tools/Makefile.in 2009-08-22 15:30:31.000000000 +0200 +@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r endif - LVMLIBS = -llvm -@@ -170,7 +169,8 @@ install_cmdlib_static: liblvm2cmd-static + install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX) +- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \ ++ $(INSTALL) -d $(libdir) ++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \ + $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) + $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX) + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ + $(includedir)/lvm2cmd.h + + install_cmdlib_static: liblvm2cmd-static.a +- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \ ++ $(INSTALL) -d $(libdir) ++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \ + $(libdir)/liblvm2cmd.a.$(LIB_VERSION) + $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ $(includedir)/lvm2cmd.h install_tools_dynamic: lvm .commands @@ -37,20 +28,23 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ $(sbindir)/lvm @echo Creating symbolic links for individual commands in $(sbindir) @( \ -@@ -181,14 +181,14 @@ install_tools_dynamic: lvm .commands +@@ -185,14 +188,17 @@ install_tools_dynamic: lvm .commands ) install_tools_static: lvm.static - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \ ++ $(INSTALL) -d $(sbindir) + $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \ $(staticdir)/lvm.static install_dmsetup_dynamic: dmsetup - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< ++ $(INSTALL) -d $(sbindir) + $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< install_dmsetup_static: dmsetup.static - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< ++ $(INSTALL) -d $(sbindir) + $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$< install_device-mapper: $(INSTALL_DMSETUP_TARGETS) |