Browse Source

flex: disable gettext, add autoconf host depends

Waldemar Brodkorb 9 years ago
parent
commit
feb53c70ff

+ 1 - 1
package/flex/Makefile

@@ -10,7 +10,7 @@ PKG_HASH:=		2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f
 PKG_DESCR:=		fast lexical analyzer
 PKG_DESCR:=		fast lexical analyzer
 PKG_SECTION:=		dev/tools
 PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host
 PKG_BUILDDEP:=		m4-host
-HOST_BUILDDEP:=		patch-host m4-host
+HOST_BUILDDEP:=		m4-host autoconf-host libtool-host
 PKG_URL:=		https://github.com/westes/flex
 PKG_URL:=		https://github.com/westes/flex
 PKG_SITES:=		https://github.com/westes/flex/releases/download/v2.6.1/
 PKG_SITES:=		https://github.com/westes/flex/releases/download/v2.6.1/
 PKG_OPTS:=		dev
 PKG_OPTS:=		dev

+ 11 - 0
package/flex/patches/patch-configure_ac

@@ -0,0 +1,11 @@
+--- flex-2.6.1.orig/configure.ac	2016-02-29 14:53:04.000000000 +0100
++++ flex-2.6.1/configure.ac	2016-06-21 00:25:18.739543528 +0200
+@@ -37,8 +37,6 @@ AC_SUBST(SHARED_VERSION_INFO)
+ 
+ # checks for programs
+ 
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.19])
+ AC_PROG_YACC
+ AM_PROG_LEX
+ AC_PROG_CC

+ 10 - 1
package/flex/patches/patch-src_Makefile_am

@@ -1,5 +1,14 @@
 --- flex-2.6.1.orig/src/Makefile.am	2016-02-27 14:53:59.000000000 +0100
 --- flex-2.6.1.orig/src/Makefile.am	2016-02-27 14:53:59.000000000 +0100
-+++ flex-2.6.1/src/Makefile.am	2016-06-20 23:42:55.000000000 +0200
++++ flex-2.6.1/src/Makefile.am	2016-06-21 00:33:09.061676013 +0200
+@@ -41,7 +41,7 @@ COMMON_SOURCES = \
+ 	tblcmp.c \
+ 	yylex.c
+ 
+-LDADD = ../lib/libcompat.la @LIBINTL@
++LDADD = ../lib/libcompat.la
+ 
+ libfl_la_SOURCES = \
+ 	libmain.c \
 @@ -90,7 +90,7 @@ stage1scan.l: scan.l
 @@ -90,7 +90,7 @@ stage1scan.l: scan.l
  	cp $(srcdir)/scan.l $(srcdir)/stage1scan.l
  	cp $(srcdir)/scan.l $(srcdir)/stage1scan.l