Fix flex build

fourkbomb · Nov 1, 2017 · 5906866 · 5906866
1 parent 06580f7
commit 5906866
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/package/flex/0001-flex-disable-documentation.patch b/package/flex/0001-flex-disable-documentation.patch
@@ -1,4 +1,7 @@
-flex: disable documentation
+From a98443c6a72d5821d4e0152311e5c3eb4cdff25c Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date: Wed, 13 Sep 2017 17:26:48 +0300
+Subject: [PATCH] flex: disable documentation
 
 Since we prevent the flex binary to be built, we also need to prevent
 the documentation to be built, otherwise it will fail like this:
@@ -9,15 +12,24 @@ make[2]: *** No rule to make target '../src/flex', needed by 'flex.1'.
 Stop.
 
 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+[Adrian: patch Makefile.am instead of Makefile.in]
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
 
-diff -rup a/Makefile.in b/Makefile.in
---- a/Makefile.in	2017-05-06 15:49:09.000000000 +0100
-+++ b/Makefile.in	2017-05-10 14:35:20.152794902 +0100
-@@ -450,7 +450,6 @@ EXTRA_DIST = \
+diff --git a/Makefile.am b/Makefile.am
+index 638c549..9db3420 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -43,7 +43,6 @@ EXTRA_DIST = \
 
  SUBDIRS = \
  	src \
 -	doc \
  	examples \
  	po \
  	tests \
+-- 
+2.14.1
+
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
@@ -10,9 +10,15 @@ FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING
 FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4
-FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
+FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 ac_cv_func_reallocarray=no
 HOST_FLEX_DEPENDENCIES = host-m4
 
+
+# 0001-flex-disable-documentation.patch
+# 0002-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
+FLEX_AUTORECONF = YES
+FLEX_GETTEXTIZE = YES
+
 define FLEX_DISABLE_PROGRAM
 	$(SED) 's/^bin_PROGRAMS.*//' $(@D)/src/Makefile.in
 endef