Enable patch application for mdadm, add patch to fix compilation (bug #381089)

Conflicts:

	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3c8c32aadccf921d6244d464f3c812ddb1ab80d5..9c0cdd6fc309e1339467014e8880908e1083106f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  30 Aug 2011; Sebastian Pipping <sping@gentoo.org>
+  +patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch, gen_compile.sh:
+  Enable patch application for mdadm, add patch to fix compilation (bug
+  #381089)
+
   07 Jun 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.16
 

diff --git a/gen_compile.sh b/gen_compile.sh
index ec752ce05f6495ba5da4785a649616b046149f80..7678d402afd8b963bcfc521322bdea7d8b5c23fc 100755 (executable)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -470,6 +470,7 @@ compile_mdadm() {
                        gen_die 'MDADM directory ${MDADM_DIR} is invalid!'
 
                cd "${MDADM_DIR}"
+               apply_patches mdadm ${MDADM_VER}
                sed -i "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os:" Makefile
                sed -i "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os:" Makefile
                sed -i "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" Makefile

diff --git a/patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch b/patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch
new file mode 100644 (file)
index 0000000..82b0b3e
--- /dev/null
+++ b/patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch
@@ -0,0 +1,26 @@
+From 5296bc73a66e9eee31ba79d26aa02543205a7a26 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 30 Aug 2011 14:38:14 +0200
+Subject: [PATCH] Replace "-z now" by "-Wl,-z,now" to fix compilation with GCC
+ 4.4.5 on Alpha (bug #331653)
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e2c65a5..0cc9a87 100644
+--- a/Makefile
++++ b/Makefile
+@@ -167,7 +167,7 @@ mdmon.O2 : $(MON_SRCS) mdadm.h mdmon.h
+ 
+ # use '-z now' to guarantee no dynamic linker interactions with the monitor thread
+ mdmon : $(MON_OBJS)
+-      $(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
++      $(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
+ msg.o: msg.c msg.h
+ 
+ test_stripe : restripe.c mdadm.h
+-- 
+1.7.6.1
+