diff --git a/lvm2/.md5sum b/lvm2/.md5sum index 44fcb6506..c3bcb78ed 100644 --- a/lvm2/.md5sum +++ b/lvm2/.md5sum @@ -1,2 +1 @@ -321429cd1b1526a29cf6d75018b1e4bb LVM2.2.02.88.tgz -fe77537669f1aa73c1c4bcfe13036961 lvm2-static_build.patch +56ca3f2c818d56dc6563fc36a8b6f1d5 LVM2.2.02.90.tgz diff --git a/lvm2/Pkgfile b/lvm2/Pkgfile index 6d82f2617..ba53146ed 100644 --- a/lvm2/Pkgfile +++ b/lvm2/Pkgfile @@ -4,16 +4,13 @@ # Depends on: libdevmapper name=lvm2 -version=2.02.88 +version=2.02.90 release=1 -source=(ftp://sources.redhat.com/pub/lvm2/releases/LVM2.$version.tgz - lvm2-static_build.patch) +source=(ftp://sources.redhat.com/pub/lvm2/releases/LVM2.$version.tgz) build() { cd LVM2.$version - patch -p1 -i $SRC/lvm2-static_build.patch - ./configure --prefix=/usr \ --exec-prefix= \ --datarootdir=/usr \ diff --git a/lvm2/lvm2-static_build.patch b/lvm2/lvm2-static_build.patch deleted file mode 100644 index c7ea788bb..000000000 --- a/lvm2/lvm2-static_build.patch +++ /dev/null @@ -1,23 +0,0 @@ -# https://bugzilla.redhat.com/show_bug.cgi?id=642999 - -diff -Nru LVM2.2.02.72.orig/tools/Makefile.in LVM2.2.02.72/tools/Makefile.in ---- LVM2.2.02.72.orig/tools/Makefile.in 2010-08-05 18:58:02.778823394 +0000 -+++ LVM2.2.02.72/tools/Makefile.in 2010-08-05 18:58:18.808671810 +0000 -@@ -126,7 +126,7 @@ - -o $@ dmsetup.o -ldevmapper $(LIBS) - - dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a -- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ -+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) \ - -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) - - all: device-mapper -@@ -136,7 +136,7 @@ - $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic - - lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a -- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ -+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) -o $@ \ - $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) - - liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o