[packages] lvm2: update to 2.02.64 (closes: #7291)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@21385 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2010-05-06 00:16:00 +00:00
parent aaa0fef171
commit 85c8ae7d5f
2 changed files with 39 additions and 60 deletions

View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=LVM2 PKG_NAME:=LVM2
PKG_VERSION:=2.02.63 PKG_VERSION:=2.02.64
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2/ \ PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2/ \
http://netbsd.mirrors.tds.net/pub/sourceware.org/lvm2/ http://netbsd.mirrors.tds.net/pub/sourceware.org/lvm2/
PKG_MD5SUM:=74bb3beeefe68d539ab712e92fddfb39 PKG_MD5SUM:=59fc0f7f6703a8c7f12df6b7d2e509fb
# 2.02.43 = fc34655706a2aa116b92328b24fad619 # 2.02.43 = fc34655706a2aa116b92328b24fad619
# 2.02.44 = 4ed7b99903a6fc5165b7b0b8def42486 # 2.02.44 = 4ed7b99903a6fc5165b7b0b8def42486
# 2.02.53 = f9ae3579bf15467b7f1d7aea8b9ed9b3 # 2.02.53 = f9ae3579bf15467b7f1d7aea8b9ed9b3

View File

@ -1,58 +1,37 @@
*** LVM2.2.02.63/make.tmpl.in 2010-04-17 17:18:45.407964881 -0700 --- a/make.tmpl.in
--- LVM2.2.02.63/make.tmpl.in 2010-04-17 17:21:38.467947847 -0700 +++ b/make.tmpl.in
*************** @@ -116,11 +116,9 @@ ifeq ("@INTL@", "yes")
*** 113,123 **** endif
endif
LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib -CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
- CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
ifeq ("@DMEVENTD@", "yes")
ifeq ("@DMEVENTD@", "yes") LDFLAGS += -L$(top_builddir)/daemons/dmeventd
LDFLAGS += -L$(top_builddir)/daemons/dmeventd - CLDFLAGS += -L$(top_builddir)/daemons/dmeventd
- CLDFLAGS += -L$(top_builddir)/daemons/dmeventd endif
endif
ifeq ("@DM_COMPAT@", "yes")
ifeq ("@DM_COMPAT@", "yes") @@ -291,11 +289,11 @@ TARGETS += $(LIB_SHARED).$(LIB_VERSION)
--- 113,121 ---- $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
*************** ifeq ("@LIB_SUFFIX@","so")
*** 288,298 **** $(CC) -shared -Wl,-soname,$(notdir $@) \
$(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS) - $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
ifeq ("@LIB_SUFFIX@","so") + $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
$(CC) -shared -Wl,-soname,$(notdir $@) \ endif
! $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ ifeq ("@LIB_SUFFIX@","dylib")
endif $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
ifeq ("@LIB_SUFFIX@","dylib") - $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \ + $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
! $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ endif
endif
$(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
$(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION) @@ -313,7 +311,7 @@ endif
--- 286,296 ----
$(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS) %.so: %.a
ifeq ("@LIB_SUFFIX@","so") $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
$(CC) -shared -Wl,-soname,$(notdir $@) \ - $(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
! $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ + $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(LIBS) -o $@ \
endif @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
ifeq ("@LIB_SUFFIX@","dylib")
$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \ $(LIB_STATIC): $(OBJECTS)
! $(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)