diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2011-08-30 14:44:06 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2011-08-30 14:45:18 +0200 |
| commit | fe5f95c9315c23429cac9807671e13da34f57414 (patch) | |
| tree | 528552a910716f2b7e1301ed03f7a0b409649800 | |
| parent | aufs: add basic support to AUFS2, requires kernel with aufs module or built-in (diff) | |
| download | genkernel-fe5f95c9315c23429cac9807671e13da34f57414.tar.gz genkernel-fe5f95c9315c23429cac9807671e13da34f57414.tar.bz2 genkernel-fe5f95c9315c23429cac9807671e13da34f57414.zip | |
Enable patch application for mdadm, add patch to fix compilation (bug #381089)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | gen_compile.sh | 1 | ||||
| -rw-r--r-- | patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch | 26 |
3 files changed, 32 insertions, 0 deletions
@@ -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) + 28 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> defaults/initrd.scripts, defaults/linuxrc, doc/genkernel.8.txt: Add basic support to AUFS2, requires kernel with aufs module or built-in diff --git a/gen_compile.sh b/gen_compile.sh index ae66ca2c..2f8a71ac 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -475,6 +475,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 index 00000000..82b0b3e2 --- /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 + |