summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-11-01 17:03:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-11-01 17:03:00 +0100
commit9ff7870c8b0c2add46bd778fa231b675fc677546 (patch)
treeeeae4e7f95de679cd4b2fc1d06a356c04c4fe343
parentc81c63189c14697327cecf923486324ef2a0ae3c (diff)
flex: update to 2.6.2
-rw-r--r--package/bison/Makefile4
-rw-r--r--package/flex/Makefile13
-rw-r--r--package/flex/patches/patch-Makefile_am4
-rw-r--r--package/flex/patches/patch-configure_ac4
-rw-r--r--package/flex/patches/patch-src_Makefile_am17
5 files changed, 18 insertions, 24 deletions
diff --git a/package/bison/Makefile b/package/bison/Makefile
index ad07639cf..f7716611e 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_HASH:= a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1
PKG_DESCR:= parser generator
PKG_SECTION:= dev/tools
-PKG_BUILDDEP:= m4-host flex-host bison-host
-HOST_BUILDDEP:= m4-host flex-host
+PKG_BUILDDEP:= m4-host bison-host
+HOST_BUILDDEP:= m4-host
PKG_URL:= http://www.gnu.org/software/bison/
PKG_SITES:= $(MASTER_SITE_GNU:=bison/)
diff --git a/package/flex/Makefile b/package/flex/Makefile
index 81ad60060..a25378e81 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -4,17 +4,19 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= flex
-PKG_VERSION:= 2.6.1
+PKG_VERSION:= 2.6.2
PKG_RELEASE:= 1
-PKG_HASH:= 2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f
+PKG_HASH:= 9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9
PKG_DESCR:= fast lexical analyzer
PKG_SECTION:= dev/tools
PKG_BUILDDEP:= m4-host
-HOST_BUILDDEP:= m4-host autoconf-host libtool-host
+HOST_BUILDDEP:= m4-host bison-host patch-host
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/v$(PKG_VERSION)/
PKG_OPTS:= dev
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
include $(ADK_TOPDIR)/mk/host.mk
include $(ADK_TOPDIR)/mk/package.mk
@@ -22,8 +24,9 @@ $(eval $(call HOST_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE)))
$(eval $(call PKG_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
AUTOTOOL_STYLE:= autoreconf
-HOST_MAKE_FLAGS+= STAGE1FLEX=$(WRKSRC)/src/stage1flex
+HOST_MAKE_FLAGS+= STAGE1FLEX=$(WRKSRC)/src/stage1flex
MAKE_FLAGS+= STAGE1FLEX=$(STAGING_HOST_DIR)/usr/bin/stage1flex
+CONFIGURE_ENV+= ac_cv_path_HELP2MAN=true
CONFIGURE_ARGS+= --disable-shared
hostpost-install:
diff --git a/package/flex/patches/patch-Makefile_am b/package/flex/patches/patch-Makefile_am
index 31b063b6e..6904acae3 100644
--- a/package/flex/patches/patch-Makefile_am
+++ b/package/flex/patches/patch-Makefile_am
@@ -1,5 +1,5 @@
---- flex-2.6.1.orig/Makefile.am 2016-02-27 14:53:59.000000000 +0100
-+++ flex-2.6.1/Makefile.am 2016-06-20 23:50:16.000000000 +0200
+--- flex-2.6.2.orig/Makefile.am 2016-10-21 02:43:44.000000000 +0200
++++ flex-2.6.2/Makefile.am 2016-11-01 14:32:34.899271200 +0100
@@ -45,10 +45,6 @@ EXTRA_DIST = \
SUBDIRS = \
lib \
diff --git a/package/flex/patches/patch-configure_ac b/package/flex/patches/patch-configure_ac
index 0c5e63de6..3b6b448c4 100644
--- a/package/flex/patches/patch-configure_ac
+++ b/package/flex/patches/patch-configure_ac
@@ -1,5 +1,5 @@
---- 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
+--- flex-2.6.2.orig/configure.ac 2016-10-25 00:13:14.000000000 +0200
++++ flex-2.6.2/configure.ac 2016-11-01 14:32:44.985688700 +0100
@@ -37,8 +37,6 @@ AC_SUBST(SHARED_VERSION_INFO)
# checks for programs
diff --git a/package/flex/patches/patch-src_Makefile_am b/package/flex/patches/patch-src_Makefile_am
index 026807c9a..2c9fdc441 100644
--- a/package/flex/patches/patch-src_Makefile_am
+++ b/package/flex/patches/patch-src_Makefile_am
@@ -1,7 +1,7 @@
---- 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-21 00:33:09.061676013 +0200
-@@ -41,7 +41,7 @@ COMMON_SOURCES = \
- tblcmp.c \
+--- flex-2.6.2.orig/src/Makefile.am 2016-10-21 02:43:44.000000000 +0200
++++ flex-2.6.2/src/Makefile.am 2016-11-01 14:36:37.543694900 +0100
+@@ -54,7 +54,7 @@ COMMON_SOURCES = \
+ version.h \
yylex.c
-LDADD = ../lib/libcompat.la @LIBINTL@
@@ -9,12 +9,3 @@
libfl_la_SOURCES = \
libmain.c \
-@@ -90,7 +90,7 @@ stage1scan.l: scan.l
- cp $(srcdir)/scan.l $(srcdir)/stage1scan.l
-
- stage1scan.c: stage1scan.l stage1flex$(EXEEXT)
-- $(top_builddir)/src/stage1flex$(EXEEXT) -o $@ $<
-+ $(STAGE1FLEX) -o $@ $<
-
- # Explicitly describe dependencies.
- # You can recreate this with `gcc -I. -MM *.c'