[Ipcop-svn] SF.net SVN: ipcop:[4405] ipcop/trunk

[<ges...@us...>]

Revision: 4405
          http://ipcop.svn.sourceforge.net/ipcop/?rev=4405&view=rev
Author:   gespinasse
Date:     2010-03-23 21:32:07 +0000 (Tue, 23 Mar 2010)

Log Message:
-----------
My bad. Should have used LFS patch

Modified Paths:
--------------
    ipcop/trunk/lfs/flex

Removed Paths:
-------------
    ipcop/trunk/src/patches/flex-2.5.35_EOF-tests.patch

Modified: ipcop/trunk/lfs/flex
===================================================================
--- ipcop/trunk/lfs/flex	2010-03-23 21:00:30 UTC (rev 4404)
+++ ipcop/trunk/lfs/flex	2010-03-23 21:32:07 UTC (rev 4405)
@@ -43,15 +43,20 @@
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+PATCH1     = $(THISAPP)-gcc44-1.patch
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects		= $(DL_FILE)
+objects		= $(DL_FILE) \
+objects		$(PATCH1)
 
 $(DL_FILE)	= $(DL_FROM)/$(DL_FILE)
+$(PATCH1)	= $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
 
 $(DL_FILE)_MD5	= 10714e50cea54dc7a227e3eddcd44d57
+$(PATCH1)_MD5	= ad9109820534278c6dd0898178c0788f
 
 install : $(TARGET)
 
@@ -81,7 +86,7 @@
 $(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)_EOF-tests.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
 
 	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make -j $(PARALLELISM)

Deleted: ipcop/trunk/src/patches/flex-2.5.35_EOF-tests.patch
===================================================================
--- ipcop/trunk/src/patches/flex-2.5.35_EOF-tests.patch	2010-03-23 21:00:30 UTC (rev 4404)
+++ ipcop/trunk/src/patches/flex-2.5.35_EOF-tests.patch	2010-03-23 21:32:07 UTC (rev 4405)
@@ -1,33 +0,0 @@
-diff -Nur flex-2.5.35.old/tests/test-c++-basic/scanner.l flex-2.5.35/tests/test-c++-basic/scanner.l
---- flex-2.5.35.old/tests/test-c++-basic/scanner.l	2002-08-22 03:11:07.000000000 +0200
-+++ flex-2.5.35/tests/test-c++-basic/scanner.l	2010-03-22 23:25:58.000000000 +0100
-@@ -24,6 +24,7 @@
- %{
- 
- #include "config.h"
-+#include <stdio.h>
- 
- %}
- 
-diff -Nur flex-2.5.35.old/tests/test-c++-multiple-scanners/scanner-1.l flex-2.5.35/tests/test-c++-multiple-scanners/scanner-1.l
---- flex-2.5.35.old/tests/test-c++-multiple-scanners/scanner-1.l	2002-10-01 17:10:12.000000000 +0200
-+++ flex-2.5.35/tests/test-c++-multiple-scanners/scanner-1.l	2010-03-22 23:47:32.000000000 +0100
-@@ -21,6 +21,7 @@
- 
- %{
- #include "config.h"
-+#include <stdio.h>
- 
- %}
- 
-diff -Nur flex-2.5.35.old/tests/test-c++-multiple-scanners/scanner-2.l flex-2.5.35/tests/test-c++-multiple-scanners/scanner-2.l
---- flex-2.5.35.old/tests/test-c++-multiple-scanners/scanner-2.l	2006-10-23 00:17:38.000000000 +0200
-+++ flex-2.5.35/tests/test-c++-multiple-scanners/scanner-2.l	2010-03-22 23:52:54.000000000 +0100
-@@ -21,6 +21,7 @@
- 
- %{
- #include "config.h"
-+#include <cstdio>
- 
- %}
- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.