Skip to content

Commit 5906866

Browse files
committed
Fix flex build
1 parent 06580f7 commit 5906866

2 files changed

Lines changed: 24 additions & 6 deletions

File tree

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
flex: disable documentation
1+
From a98443c6a72d5821d4e0152311e5c3eb4cdff25c Mon Sep 17 00:00:00 2001
2+
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
3+
Date: Wed, 13 Sep 2017 17:26:48 +0300
4+
Subject: [PATCH] flex: disable documentation
25

36
Since we prevent the flex binary to be built, we also need to prevent
47
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'.
912
Stop.
1013

1114
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
15+
[Adrian: patch Makefile.am instead of Makefile.in]
16+
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
17+
---
18+
Makefile.am | 1 -
19+
1 file changed, 1 deletion(-)
1220

13-
diff -rup a/Makefile.in b/Makefile.in
14-
--- a/Makefile.in 2017-05-06 15:49:09.000000000 +0100
15-
+++ b/Makefile.in 2017-05-10 14:35:20.152794902 +0100
16-
@@ -450,7 +450,6 @@ EXTRA_DIST = \
21+
diff --git a/Makefile.am b/Makefile.am
22+
index 638c549..9db3420 100644
23+
--- a/Makefile.am
24+
+++ b/Makefile.am
25+
@@ -43,7 +43,6 @@ EXTRA_DIST = \
1726

1827
SUBDIRS = \
1928
src \
2029
- doc \
2130
examples \
2231
po \
2332
tests \
33+
--
34+
2.14.1
35+

‎package/flex/flex.mk‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@ FLEX_INSTALL_STAGING = YES
1010
FLEX_LICENSE = FLEX
1111
FLEX_LICENSE_FILES = COPYING
1212
FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4
13-
FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
13+
FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 ac_cv_func_reallocarray=no
1414
HOST_FLEX_DEPENDENCIES = host-m4
1515

16+
17+
# 0001-flex-disable-documentation.patch
18+
# 0002-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
19+
FLEX_AUTORECONF = YES
20+
FLEX_GETTEXTIZE = YES
21+
1622
define FLEX_DISABLE_PROGRAM
1723
$(SED) 's/^bin_PROGRAMS.*//' $(@D)/src/Makefile.in
1824
endef

0 commit comments

Comments
 (0)