Revert "lvm2: remove patch, --no-export-dynamic dosn't work with ld 2.19.1"

This reverts commit d4a313c5cc.
This commit is contained in:
Juergen Daubert 2010-08-07 15:25:38 +02:00
parent 414a5124e7
commit 5b8d3396d6
3 changed files with 27 additions and 2 deletions

View File

@ -1 +1,2 @@
a7d0d1235a589869bd13cde0f0d7375d LVM2.2.02.72.tgz
47ba25b8253d6a6f4385461ae814086e lvm2-static_build.patch

View File

@ -5,12 +5,15 @@
name=lvm2
version=2.02.72
release=2
source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz)
release=1
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 \

View File

@ -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