aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-03-21 21:50:46 +0100
committerThomas Deutschmann <whissi@gentoo.org>2019-03-21 21:50:46 +0100
commitd29d35d22c47eed852d95cd7ea5b313d1c51929d (patch)
treec4b4421779518ae431e689939a92389b3801fb12 /patches
parentBump LVM2 to v2.02.183 (diff)
downloadgenkernel-d29d35d22c47eed852d95cd7ea5b313d1c51929d.tar.gz
genkernel-d29d35d22c47eed852d95cd7ea5b313d1c51929d.tar.bz2
genkernel-d29d35d22c47eed852d95cd7ea5b313d1c51929d.zip
Fix compilation of dmraid
Fixes: https://bugs.gentoo.org/642988 Fixes: https://bugs.gentoo.org/644094 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'patches')
-rw-r--r--patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0.rc16-3-staticlink.patch (renamed from patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch)0
-rw-r--r--patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-parallel-make.patch11
-rw-r--r--patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-return-all-sets.patch (renamed from patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch)0
-rw-r--r--patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-static-build-fixes.patch (renamed from patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch)0
-rw-r--r--patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-undo-p-rename.patch (renamed from patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch)0
-rw-r--r--patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch11
6 files changed, 11 insertions, 11 deletions
diff --git a/patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0.rc16-3-staticlink.patch
index a80870f..a80870f 100644
--- a/patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch
+++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0.rc16-3-staticlink.patch
diff --git a/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-parallel-make.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-parallel-make.patch
new file mode 100644
index 0000000..8c89374
--- /dev/null
+++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-parallel-make.patch
@@ -0,0 +1,11 @@
+--- dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in.orig 2016-09-20 12:54:09.416628404 +0200
++++ dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in 2016-09-20 12:55:06.343698229 +0200
+@@ -79,7 +79,7 @@
+ -Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) \
+ $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(DL_LIBS) $(LIBS)
+
+-$(LIB_EVENTS_SHARED): $(OBJECTS2)
++$(LIB_EVENTS_SHARED): $(OBJECTS2) $(LIB_SHARED)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
+ -shared -Wl,--discard-all -Wl,--no-undefined -Wl,-soname,$(notdir $@) \
+ $(LIB_SHARED) $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(PTHREAD_LIBS) $(LIBS)
diff --git a/patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-return-all-sets.patch
index 1e6c713..1e6c713 100644
--- a/patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch
+++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-return-all-sets.patch
diff --git a/patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-static-build-fixes.patch
index 2988117..2988117 100644
--- a/patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch
+++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-static-build-fixes.patch
diff --git a/patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-undo-p-rename.patch
index 6636b05..6636b05 100644
--- a/patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch
+++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-undo-p-rename.patch
diff --git a/patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch b/patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch
deleted file mode 100644
index cf30188..0000000
--- a/patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 1.0.0.rc16/make.tmpl.in 2010-08-16 10:22:32.000000000 -0400
-+++ 1.0.0.rc16/make.tmpl.in 2010-08-16 10:42:49.000000000 -0400
-@@ -136,7 +136,7 @@
-
- %.so: $(OBJECTS)
- $(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
-- -Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event
-+ $(LDFLAGS) -Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event -ldl
-
- $(LIB_STATIC): $(OBJECTS)
- $(RM) $@