diff options
| author | Juergen Daubert <jue@jue.li> | 2010-08-07 15:25:38 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2010-08-07 15:25:38 +0200 |
| commit | 5b8d3396d6e6fd7e4d4a7fcf368bed6e7dd03384 (patch) | |
| tree | 260e9577d821f9aed2ffa67fbc1798c827bc00f3 /lvm2 | |
| parent | 414a5124e7674c963e4ee7be621fd3a891206a71 (diff) | |
| download | opt-5b8d3396d6e6fd7e4d4a7fcf368bed6e7dd03384.tar.gz opt-5b8d3396d6e6fd7e4d4a7fcf368bed6e7dd03384.tar.xz | |
Revert "lvm2: remove patch, --no-export-dynamic dosn't work with ld 2.19.1"2.7-rc2
This reverts commit d4a313c5cc6f27258fe90e8852c31598bfe11673.
Diffstat (limited to 'lvm2')
| -rw-r--r-- | lvm2/.md5sum | 1 | ||||
| -rw-r--r-- | lvm2/Pkgfile | 7 | ||||
| -rw-r--r-- | lvm2/lvm2-static_build.patch | 21 |
3 files changed, 27 insertions, 2 deletions
diff --git a/lvm2/.md5sum b/lvm2/.md5sum index ffddd40d4..ba73bb5ef 100644 --- a/lvm2/.md5sum +++ b/lvm2/.md5sum @@ -1 +1,2 @@ a7d0d1235a589869bd13cde0f0d7375d LVM2.2.02.72.tgz +47ba25b8253d6a6f4385461ae814086e lvm2-static_build.patch diff --git a/lvm2/Pkgfile b/lvm2/Pkgfile index 1f93bf6ab..43c35b97a 100644 --- a/lvm2/Pkgfile +++ b/lvm2/Pkgfile @@ -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 \ 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 |