Summary: Update lvm2 to 2.02.63
Author: Jack Donohue <jdonohue654-openwrt@yahoo.com> Also add a MAINTAINER entry in the Makefile while we're here. git-svn-id: svn://svn.openwrt.org/openwrt/packages@21002 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
7a180cf804
commit
f480bdfc49
@ -6,18 +6,21 @@
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
MAINTAINER:=Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
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
|
||||
# 2.02.60 = 33e0e0f4b4582d495ff619696c634b2a
|
||||
# 2.02.63 = 74bb3beeefe68d539ab712e92fddfb39
|
||||
|
||||
# OpenWRT normally expects the tarball to expand into
|
||||
# $(PKG_NAME)-$(PKG_VERSION), and this magic incantation seems to make it
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user