diff options
| author | Juergen Daubert <jue@jue.li> | 2010-08-06 11:23:27 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2010-08-06 11:23:27 +0200 |
| commit | e7b2ba64845474d0faf7c4792bb43b90e87edbd4 (patch) | |
| tree | 69e6c4d4b303a47bacfd527defd22680033fac67 /lvm2 | |
| parent | 998bc0f0570962cb3f4c2b71e1afbc2109da0bd2 (diff) | |
| download | opt-e7b2ba64845474d0faf7c4792bb43b90e87edbd4.tar.gz opt-e7b2ba64845474d0faf7c4792bb43b90e87edbd4.tar.xz | |
lvm2: update to 2.02.72, fix building with glibc 2.12
To build against glibc 2.12.1 we have to add --no-export-dynamic
to the ld options used to link lvm.static.
Using --export-dynamic doesn't make sense in a static link anyway.
Diffstat (limited to 'lvm2')
| -rw-r--r-- | lvm2/.md5sum | 3 | ||||
| -rw-r--r-- | lvm2/Pkgfile | 8 | ||||
| -rw-r--r-- | lvm2/lvm2-static_build.patch | 21 |
3 files changed, 28 insertions, 4 deletions
diff --git a/lvm2/.md5sum b/lvm2/.md5sum index f99160e81..ba73bb5ef 100644 --- a/lvm2/.md5sum +++ b/lvm2/.md5sum @@ -1 +1,2 @@ -39c26d5a821754cc347d7a19e82d4a24 LVM2.2.02.70.tgz +a7d0d1235a589869bd13cde0f0d7375d LVM2.2.02.72.tgz +47ba25b8253d6a6f4385461ae814086e lvm2-static_build.patch diff --git a/lvm2/Pkgfile b/lvm2/Pkgfile index 59e0e049f..43c35b97a 100644 --- a/lvm2/Pkgfile +++ b/lvm2/Pkgfile @@ -4,20 +4,22 @@ # Depends on: libdevmapper name=lvm2 -version=2.02.70 +version=2.02.72 release=1 -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz) +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz + lvm2-static_build.patch) build() { cd LVM2.$version + patch -p1 -i $SRC/lvm2-static_build.patch + ./configure --prefix=/usr \ --exec_prefix= \ --datarootdir=/usr \ --disable-readline \ --enable-static_link \ --with-{user,group}=root - make make DESTDIR=$PKG install_lvm2 diff --git a/lvm2/lvm2-static_build.patch b/lvm2/lvm2-static_build.patch new file mode 100644 index 000000000..7791a896f --- /dev/null +++ b/lvm2/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 |