From 45945cf7bdac3b688c9e82a4898ad1eb1df265b7 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 13 Jan 2012 21:57:10 +0100 Subject: [PATCH] Copy patch from lvm/2.02.74 to lvm/2.02.88 --- ChangeLog | 4 ++ .../lvm2-2.02.72-no-export-dynamic.patch | 37 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch diff --git a/ChangeLog b/ChangeLog index e1a5545..1652e96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 13 Jan 2012; Sebastian Pipping + +patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch: + Copy patch from lvm/2.02.74 to lvm/2.02.88 + 13 Jan 2012; Robin H. Johnson gen_determineargs.sh: Prior to commit a141d715, CMD_NOINSTALL had no default set, but most of the usages were of the form "! isTrue ${CMD_NOINSTALL}", which on an unset value, diff --git a/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch b/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch new file mode 100644 index 0000000..05c7bf3 --- /dev/null +++ b/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch @@ -0,0 +1,37 @@ +X-Gentoo-Bug: 332905 +X-Patch-URL: https://bugs.gentoo.org/attachment.cgi?id=243283&action=view +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=332905 + +diff -ur LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in LVM2.2.02.72/daemons/dmeventd/Makefile.in +--- LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in 2010-05-14 16:36:56.000000000 +0300 ++++ LVM2.2.02.72/daemons/dmeventd/Makefile.in 2010-08-17 03:00:24.000000000 +0300 +@@ -61,7 +61,7 @@ + $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic + + dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a +- $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \ ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L. -L$(interfacebuilddir) -o $@ \ + dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS) + + ifeq ("@PKGCONFIG@", "yes") +diff -ur LVM2.2.02.72.orig/tools/Makefile.in LVM2.2.02.72/tools/Makefile.in +--- LVM2.2.02.72.orig/tools/Makefile.in 2010-06-25 21:23:10.000000000 +0300 ++++ LVM2.2.02.72/tools/Makefile.in 2010-08-17 03:01:07.000000000 +0300 +@@ -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 -- 2.26.2