summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-06-25 00:21:12 +0000
committerMike Frysinger <vapier@gentoo.org>2006-06-25 00:21:12 +0000
commit699094bdaae468821208f67af8848993a806c1cc (patch)
tree838ca224617f86a401562ce21ca68f1b4131480b /sys-fs/mdadm/files
parentPatch from Tristan Heaven to avoid broken test and tidy (bug #137892) (diff)
downloadhistorical-699094bdaae468821208f67af8848993a806c1cc.tar.gz
historical-699094bdaae468821208f67af8848993a806c1cc.tar.bz2
historical-699094bdaae468821208f67af8848993a806c1cc.zip
Make sure USE=-ssl is actually respected and make sure mdadm is not rebuilt in src_install() so static/ssl keep their settings #137823 by Marcel Meyer.
Package-Manager: portage-2.1.1_pre1-r2
Diffstat (limited to 'sys-fs/mdadm/files')
-rw-r--r--sys-fs/mdadm/files/mdadm-2.5-build.patch23
-rw-r--r--sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch14
2 files changed, 36 insertions, 1 deletions
diff --git a/sys-fs/mdadm/files/mdadm-2.5-build.patch b/sys-fs/mdadm/files/mdadm-2.5-build.patch
new file mode 100644
index 000000000000..4af2b4a4e95f
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-2.5-build.patch
@@ -0,0 +1,23 @@
+Remove bogus depend otherwise things get rebuilt way too often
+
+http://bugs.gentoo.org/137823
+
+--- Makefile
++++ Makefile
+@@ -91,14 +91,12 @@
+ everything: all mdadm.static mdadm.uclibc swap_super test_stripe mdassemble mdassemble.uclibc mdassemble.static mdassemble.man
+ # mdadm.tcc doesn't work..
+
+-mdadm : rmconf $(OBJS)
++mdadm : $(OBJS)
+ $(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
+
+ mdadm.static : STATIC=-DSTATIC
+-mdadm.static : rmconf $(OBJS)
++mdadm.static : $(OBJS)
+ $(CC) $(LDFLAGS) -DSTATIC -static -o mdadm.static $(OBJS) SHA1.o sha1.o
+-rmconf:
+- rm -f config.o
+
+ mdadm.tcc : $(SRCS) mdadm.h
+ $(TCC) -o mdadm.tcc $(SRCS)
diff --git a/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch b/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch
index 4c519f3158a9..71eb1f411305 100644
--- a/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch
+++ b/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch
@@ -14,15 +14,27 @@
KLIBC=/home/src/klibc/klibc-0.77
-@@ -72,6 +76,11 @@
+@@ -72,6 +76,12 @@
Create.c Detail.c Examine.c Grow.c Monitor.c dlink.c Kill.c Query.c \
mdopen.c super0.c super1.c bitmap.c restripe.c sysfs.c
+ifneq ($(USE_SSL),1)
+OBJS += SHA1.o sha1.o
+SRCS += SHA1.c sha1.c
++CPPFLAGS += -DNO_SSL
+endif
+
ASSEMBLE_SRCS := mdassemble.c Assemble.c config.c dlink.c util.c super0.c super1.c
ASSEMBLE_FLAGS:= -DMDASSEMBLE
ifdef MDASSEMBLE_AUTO
+--- super0.c
++++ super0.c
+@@ -28,7 +28,7 @@
+ */
+
+ #include "mdadm.h"
+-#ifndef UCLIBC
++#ifndef NO_SSL
+ #include <openssl/sha.h> /* for SHA1 */
+ #else
+ extern unsigned char *SHA1(unsigned char *buf, int len, unsigned char *dest);