Revision: 7818
http://sourceforge.net/p/ipcop/svn/7818
Author: owes
Date: 2015-01-25 20:34:47 +0000 (Sun, 25 Jan 2015)
Log Message:
-----------
Update flex to 2.39
Modified Paths:
--------------
ipcop/trunk/lfs/flex
Removed Paths:
-------------
ipcop/trunk/src/patches/flex-2.5.36_bison-2.6.1.patch
Modified: ipcop/trunk/lfs/flex
===================================================================
--- ipcop/trunk/lfs/flex 2015-01-25 20:20:48 UTC (rev 7817)
+++ ipcop/trunk/lfs/flex 2015-01-25 20:34:47 UTC (rev 7818)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = flex
-VER = 2.5.37
+VER = 2.5.39
HOST_ARCH = all
OTHER_SRC = yes
@@ -49,11 +49,11 @@
# Top-level Rules
###############################################################################
-objects = $(DL_FILE)
+objects = $(DL_FILE)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c75940e1fc25108f2a7b3ef42abdae06
+$(DL_FILE)_MD5 = 77d44c6bb8c0705e0017ab9a84a1502b
install : $(TARGET)
@@ -82,8 +82,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 -p1 -i
$(DIR_PATCHES)/$(PKG_NAME)-2.5.36_bison-2.6.1.patch
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make -j $(PARALLELISM)
Deleted: ipcop/trunk/src/patches/flex-2.5.36_bison-2.6.1.patch
===================================================================
--- ipcop/trunk/src/patches/flex-2.5.36_bison-2.6.1.patch 2015-01-25
20:20:48 UTC (rev 7817)
+++ ipcop/trunk/src/patches/flex-2.5.36_bison-2.6.1.patch 2015-01-25
20:34:47 UTC (rev 7818)
@@ -1,91 +0,0 @@
-fix 2 flex tests that fail with bison-2.6.{1,2} fedora borrowed
-http://pkgs.fedoraproject.org/cgit/flex.git/plain/flex-2.5.36-bison-2.6.1.patch
-
-diff -up flex-2.5.36/tests/test-bison-yylloc/main.c~
flex-2.5.36/tests/test-bison-yylloc/main.c
---- flex-2.5.36/tests/test-bison-yylloc/main.c~ 2002-06-25
21:37:06.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylloc/main.c 2012-07-31 18:53:22.007394045
+0200
-@@ -21,8 +21,6 @@
- #include "parser.h"
- #include "scanner.h"
-
--extern int testparse(yyscan_t);
--
- int main ( int argc, char** argv )
- {
- yyscan_t scanner;
-diff -up flex-2.5.36/tests/test-bison-yylloc/parser.y~
flex-2.5.36/tests/test-bison-yylloc/parser.y
---- flex-2.5.36/tests/test-bison-yylloc/parser.y~ 2002-07-25
02:43:47.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylloc/parser.y 2012-08-01
01:06:53.093155586 +0200
-@@ -21,6 +21,8 @@
- * PURPOSE.
- */
-
-+%parse-param { void* scanner }
-+
- /*
- How to compile:
- bison --defines --output-file="parser.c" --name-prefix="test" parser.y
-@@ -32,10 +34,8 @@
- #include "config.h"
-
- #define YYERROR_VERBOSE 1
--#define YYPARSE_PARAM scanner
- #define YYLEX_PARAM scanner
-
--int yyerror(char* msg);
- extern int testget_lineno(void*);
-
-
-@@ -89,7 +89,7 @@ line:
-
- %%
-
--int yyerror(char* msg) {
-+int yyerror(void* scanner, char* msg) {
- fprintf(stderr,"%s\n",msg);
- return 0;
- }
-diff -up flex-2.5.36/tests/test-bison-yylval/main.c~
flex-2.5.36/tests/test-bison-yylval/main.c
---- flex-2.5.36/tests/test-bison-yylval/main.c~ 2002-06-25
21:37:06.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylval/main.c 2012-08-01 01:10:02.015510280
+0200
-@@ -24,8 +24,6 @@
- #include "parser.h"
- #include "scanner.h"
-
--extern int testparse(yyscan_t);
--
- int main ( int argc, char** argv )
- {
- yyscan_t scanner;
-diff -up flex-2.5.36/tests/test-bison-yylval/parser.y~
flex-2.5.36/tests/test-bison-yylval/parser.y
---- flex-2.5.36/tests/test-bison-yylval/parser.y~ 2002-06-25
21:37:06.000000000 +0200
-+++ flex-2.5.36/tests/test-bison-yylval/parser.y 2012-08-01
01:13:11.239867147 +0200
-@@ -25,6 +25,7 @@
- How to compile:
- bison --defines --output-file="parser.c" --name-prefix="test" parser.y
- */
-+%parse-param { void* scanner }
- %{
- #include <stdio.h>
- #include <stdlib.h>
-@@ -32,11 +33,8 @@
- #include "config.h"
-
- #define YYERROR_VERBOSE 1
--#define YYPARSE_PARAM scanner
- #define YYLEX_PARAM scanner
-
--int yyerror(char* msg);
--
-
- /* A dummy function. A check against seg-faults in yylval->str. */
- int process_text(char* s) {
-@@ -76,7 +74,7 @@ starttag: LT TAGNAME GT { process_
- endtag: LTSLASH TAGNAME GT { process_text($2);free($2);} ;
- %%
-
--int yyerror(char* msg) {
-+int yyerror(void* scanner, char* msg) {
- fprintf(stderr,"%s\n",msg);
- return 0;
- }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
