diff --git a/libdevmapper/.md5sum b/libdevmapper/.md5sum index f99160e8..ba73bb5e 100644 --- a/libdevmapper/.md5sum +++ b/libdevmapper/.md5sum @@ -1 +1,2 @@ -39c26d5a821754cc347d7a19e82d4a24 LVM2.2.02.70.tgz +a7d0d1235a589869bd13cde0f0d7375d LVM2.2.02.72.tgz +47ba25b8253d6a6f4385461ae814086e lvm2-static_build.patch diff --git a/libdevmapper/Pkgfile b/libdevmapper/Pkgfile index 8591e017..0422a3fd 100644 --- a/libdevmapper/Pkgfile +++ b/libdevmapper/Pkgfile @@ -3,12 +3,15 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=libdevmapper -version=1.02.52 +version=1.02.53 release=1 -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.70.tgz) +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.72.tgz + lvm2-static_build.patch) build() { - cd LVM2.2.02.70 + cd LVM2.2.02.72 + + patch -p1 -i $SRC/lvm2-static_build.patch ./configure --prefix=/usr \ --sbindir=/sbin \ diff --git a/libdevmapper/lvm2-static_build.patch b/libdevmapper/lvm2-static_build.patch new file mode 100644 index 00000000..7791a896 --- /dev/null +++ b/libdevmapper/lvm2-static_build.patch @@ -0,0 +1,21 @@ +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