This proposed patch updates lvm2 build script to 2.02.63 ... the previous version (2.02.60) is no longer available for download. this update also necessitated some minor changes to patches/100-readline-link.patch
(Previous attempt bounced ... apologies if you get 2 submissions). Signed-off-by: Jack Donohue <[email protected]> Index: patches/100-readline-link.patch =================================================================== --- patches/100-readline-link.patch (revision 20974) +++ patches/100-readline-link.patch (working copy) @@ -1,38 +1,58 @@ -=== modified file 'LVM2.2.02.43/make.tmpl.in' ---- LVM2.2.02.43/make.tmpl.in 2009-01-16 15:02:27 +0000 -+++ LVM2.2.02.43/make.tmpl.in 2009-01-16 15:02:45 +0000 -@@ -89,11 +89,9 @@ - endif - - LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib --CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib - - ifeq ("@DMEVENTD@", "yes") - LDFLAGS += -L$(top_builddir)/daemons/dmeventd -- CLDFLAGS += -L$(top_builddir)/daemons/dmeventd - endif - - ifeq ("@DM_COMPAT@", "yes") -@@ -202,18 +200,18 @@ - ifeq ("@LIB_SUFFIX@","so") - $(LIB_SHARED): $(OBJECTS) $(LDDEPS) - $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \ -- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ -+ $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ - endif - - ifeq ("@LIB_SUFFIX@","dylib") - $(LIB_SHARED): $(OBJECTS) $(LDDEPS) - $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \ -- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ -+ $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ - endif - - %.so: %.a - $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \ -- $(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \ -+ $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(LIBS) -o $@ \ - @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ - - $(LIB_STATIC): $(OBJECTS) - +*** LVM2.2.02.63/make.tmpl.in 2010-04-17 17:18:45.407964881 -0700 +--- LVM2.2.02.63/make.tmpl.in 2010-04-17 17:21:38.467947847 -0700 +*************** +*** 113,123 **** + endif + + LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib +- CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib + + ifeq ("@DMEVENTD@", "yes") + LDFLAGS += -L$(top_builddir)/daemons/dmeventd +- CLDFLAGS += -L$(top_builddir)/daemons/dmeventd + endif + + ifeq ("@DM_COMPAT@", "yes") +--- 113,121 ---- +*************** +*** 288,298 **** + $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS) + ifeq ("@LIB_SUFFIX@","so") + $(CC) -shared -Wl,-soname,$(notdir $@) \ +! $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ + endif + ifeq ("@LIB_SUFFIX@","dylib") + $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \ +! $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ + endif + + $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION) +--- 286,296 ---- + $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS) + ifeq ("@LIB_SUFFIX@","so") + $(CC) -shared -Wl,-soname,$(notdir $@) \ +! $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ + endif + ifeq ("@LIB_SUFFIX@","dylib") + $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \ +! $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ + endif + + $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION) +*************** +*** 310,316 **** + + %.so: %.a + $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \ +! $(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \ + @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ + + $(LIB_STATIC): $(OBJECTS) +--- 308,314 ---- + + %.so: %.a + $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \ +! $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(LIBS) -o $@ \ + @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ + + $(LIB_STATIC): $(OBJECTS) Index: Makefile =================================================================== --- Makefile (revision 20955) +++ Makefile (working copy) @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=LVM2 -PKG_VERSION:=2.02.60 +PKG_VERSION:=2.02.63 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2/ \ http://netbsd.mirrors.tds.net/pub/sourceware.org/lvm2/ -PKG_MD5SUM:=33e0e0f4b4582d495ff619696c634b2a +PKG_MD5SUM:=74bb3beeefe68d539ab712e92fddfb39 # 2.02.43 = fc34655706a2aa116b92328b24fad619 # 2.02.44 = 4ed7b99903a6fc5165b7b0b8def42486 # 2.02.53 = f9ae3579bf15467b7f1d7aea8b9ed9b3 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
