* [gentoo-commits] proj/genkernel:master commit in: patches/lvm/2.02.173/, patches/lvm/2.02.88/, patches/lvm/2.02.28/, ...
@ 2017-09-03 4:46 Robin H. Johnson
0 siblings, 0 replies; only message in thread
From: Robin H. Johnson @ 2017-09-03 4:46 UTC (permalink / raw
To: gentoo-commits
commit: 562ff4565b70c36e5092759881cb1fe504a342a0
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 3 04:45:19 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 04:45:19 2017 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=562ff456
lvm2: bump.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
.../lvm2-2.02.139-dynamic-static-ldflags.patch | 63 ++++++++++++++++++++++
.../lvm/2.02.28/filter-sysfs-inc-sys-stat.patch | 11 ----
patches/lvm/2.02.28/no-export-dynamic.patch | 22 --------
.../2.02.74/lvm2-2.02.72-no-export-dynamic.patch | 37 -------------
.../2.02.88/lvm2-2.02.72-no-export-dynamic.patch | 37 -------------
5 files changed, 63 insertions(+), 107 deletions(-)
diff --git a/patches/lvm/2.02.173/lvm2-2.02.139-dynamic-static-ldflags.patch b/patches/lvm/2.02.173/lvm2-2.02.139-dynamic-static-ldflags.patch
new file mode 100644
index 0000000..312e546
--- /dev/null
+++ b/patches/lvm/2.02.173/lvm2-2.02.139-dynamic-static-ldflags.patch
@@ -0,0 +1,63 @@
+diff -ur LVM2.2.02.139_O/configure.in LVM2.2.02.139/configure.in
+--- LVM2.2.02.139_O/configure.in 2016-01-19 12:54:33.155187005 +0000
++++ LVM2.2.02.139/configure.in 2016-01-19 12:56:39.487181372 +0000
+@@ -31,6 +31,7 @@
+ linux*)
+ CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+ ELDFLAGS="-Wl,--export-dynamic"
++ STATIC_LDFLAGS="-Wl,--no-export-dynamic"
+ # FIXME Generate list and use --dynamic-list=.dlopen.sym
+ CLDWHOLEARCHIVE="-Wl,-whole-archive"
+ CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+@@ -2009,6 +2010,7 @@
+ AC_SUBST(SELINUX_PC)
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
++AC_SUBST(STATIC_LDFLAGS)
+ AC_SUBST(STATIC_LINK)
+ AC_SUBST(TESTING)
+ AC_SUBST(TESTSUITE_DATA)
+diff -ur LVM2.2.02.139_O/daemons/dmeventd/Makefile.in LVM2.2.02.139/daemons/dmeventd/Makefile.in
+--- LVM2.2.02.139_O/daemons/dmeventd/Makefile.in 2016-01-19 12:54:33.278186999 +0000
++++ LVM2.2.02.139/daemons/dmeventd/Makefile.in 2016-01-19 12:57:44.277178484 +0000
+@@ -67,7 +67,7 @@
+ $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
+
+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
+- $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
++ $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
+ dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
+
+ ifeq ("@PKGCONFIG@", "yes")
+diff -ur LVM2.2.02.139_O/make.tmpl.in LVM2.2.02.139/make.tmpl.in
+--- LVM2.2.02.139_O/make.tmpl.in 2016-01-19 12:54:33.529186988 +0000
++++ LVM2.2.02.139/make.tmpl.in 2016-01-19 12:58:31.514176378 +0000
+@@ -49,6 +49,7 @@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+ LDFLAGS ?= @COPTIMISE_FLAG@ @LDFLAGS@
++STATIC_LDFLAGS += @STATIC_LDFLAGS@
+ CLDFLAGS += @CLDFLAGS@
+ ELDFLAGS += @ELDFLAGS@
+ LDDEPS += @LDDEPS@
+diff -ur LVM2.2.02.139_O/tools/Makefile.in LVM2.2.02.139/tools/Makefile.in
+--- LVM2.2.02.139_O/tools/Makefile.in 2016-01-08 18:51:21.000000000 +0000
++++ LVM2.2.02.139/tools/Makefile.in 2016-01-19 13:00:08.349172060 +0000
+@@ -129,7 +129,7 @@
+ -o $@ dmsetup.o -ldevmapper $(LIBS)
+
+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
++ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
+ -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS)
+
+ all: device-mapper
+@@ -146,7 +146,7 @@
+ endif
+
+ 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) $(STATIC_LDFLAGS) -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
diff --git a/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch b/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch
deleted file mode 100644
index 2988e92..0000000
--- a/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur LVM2.2.02.28/lib/filters/filter-sysfs.c LVM2.2.02.28.new/lib/filters/filter-sysfs.c
---- LVM2.2.02.28/lib/filters/filter-sysfs.c 2007-08-22 16:38:16.000000000 +0200
-+++ LVM2.2.02.28.new/lib/filters/filter-sysfs.c 2011-01-13 20:45:38.751542669 +0100
-@@ -15,6 +15,7 @@
- #include "lib.h"
- #include "filter-sysfs.h"
- #include "lvm-string.h"
-+#include <sys/stat.h>
-
- #ifdef linux
-
diff --git a/patches/lvm/2.02.28/no-export-dynamic.patch b/patches/lvm/2.02.28/no-export-dynamic.patch
deleted file mode 100644
index 19a4e13..0000000
--- a/patches/lvm/2.02.28/no-export-dynamic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur LVM2.2.02.28/configure LVM2.2.02.28.new/configure
---- LVM2.2.02.28/configure 2007-08-14 20:58:30.000000000 +0200
-+++ LVM2.2.02.28.new/configure 2011-01-13 20:45:08.429184861 +0100
-@@ -1949,7 +1949,6 @@
- CLDWHOLEARCHIVE="-Wl,-whole-archive"
- CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
- LDDEPS="$LDDEPS .export.sym"
-- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- LIB_SUFFIX="so"
- DEVMAPPER=yes
- ODIRECT=yes
-diff -ur LVM2.2.02.28/configure.in LVM2.2.02.28.new/configure.in
---- LVM2.2.02.28/configure.in 2007-08-14 20:58:31.000000000 +0200
-+++ LVM2.2.02.28.new/configure.in 2011-01-13 20:45:14.365688659 +0100
-@@ -38,7 +38,6 @@
- CLDWHOLEARCHIVE="-Wl,-whole-archive"
- CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
- LDDEPS="$LDDEPS .export.sym"
-- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- LIB_SUFFIX="so"
- DEVMAPPER=yes
- ODIRECT=yes
diff --git a/patches/lvm/2.02.74/lvm2-2.02.72-no-export-dynamic.patch b/patches/lvm/2.02.74/lvm2-2.02.72-no-export-dynamic.patch
deleted file mode 100644
index 05c7bf3..0000000
--- a/patches/lvm/2.02.74/lvm2-2.02.72-no-export-dynamic.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 05c7bf3..0000000
--- a/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-09-03 4:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-03 4:46 [gentoo-commits] proj/genkernel:master commit in: patches/lvm/2.02.173/, patches/lvm/2.02.88/, patches/lvm/2.02.28/, Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox