Revision: 5646
http://ipcop.svn.sourceforge.net/ipcop/?rev=5646&view=rev
Author: owes
Date: 2011-04-27 20:06:27 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
Remove mdadm patch now upstream.
Modified Paths:
--------------
ipcop/trunk/lfs/mdadm
Removed Paths:
-------------
ipcop/trunk/src/patches/mdadm-3.1.4_non-x86.patch
Modified: ipcop/trunk/lfs/mdadm
===================================================================
--- ipcop/trunk/lfs/mdadm 2011-04-27 20:05:01 UTC (rev 5645)
+++ ipcop/trunk/lfs/mdadm 2011-04-27 20:06:27 UTC (rev 5646)
@@ -81,7 +81,6 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_non-x86.patch
cd $(DIR_APP) && make -j $(PARALLELISM)
Deleted: ipcop/trunk/src/patches/mdadm-3.1.4_non-x86.patch
===================================================================
--- ipcop/trunk/src/patches/mdadm-3.1.4_non-x86.patch 2011-04-27 20:05:01 UTC
(rev 5645)
+++ ipcop/trunk/src/patches/mdadm-3.1.4_non-x86.patch 2011-04-27 20:06:27 UTC
(rev 5646)
@@ -1,29 +0,0 @@
-From 8efb9d16ac4026ca237a2d887240543b1763b634 Mon Sep 17 00:00:00 2001
-From: NeilBrown <ne...@suse.de>
-Date: Fri, 3 Sep 2010 13:33:29 +1000
-Subject: [PATCH] Fix compile error on non-x86 systems.
-
--z is not an option for 'gcc', it is an option for the loader!!
-
-Reported-by: Debian build system
-Signed-off-by: NeilBrown <ne...@suse.de>
----
- 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.6.5
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
