From 131995ff5ab632c74f36a3b89a5571452cf75da7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 8 Oct 2017 23:44:23 +0200 Subject: flex: rework patches to avoid host/target difference Currently, the target and host flex packages do not behave the same in terms of patching: the target variant has a patch hook that disables building the programs (because they are not needed, and do not build on no-MMU platforms). However, this hook is obviously not executed for host-flex, because we really want the host flex binary to be built. In preparation for the introduction of out-of-tree package build, it is important that we don't do different things in the patch hooks for the target and host variant of a given package, because the source tree will be shared between the target and host builds. To solve this, we introduce a --disable-program configure option, through a patch to the flex configure.ac and Makefile.am. This patch makes the current 0001-flex-disable-documentation.patch no longer needed. Furthermore, building the documentation is a PITA: flex.1 depends on configure.ac and a few other files generated during the build. Touching flex.1 does not work, because automake will forcibly remove the files when its prerequisites are too old, so pre-requisites of flex.1 will always be more recent than flex.1. So, we add a patch that adds a --disable-doc configure option. Fixes: http://autobuild.buildroot.org/results/f70/f70b39632535bb9692d0a032166b2f4104532967/ http://autobuild.buildroot.org/results/525/52567afdfe7992b3518de0e01227ba14aa300f21/ [...] Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: - rebase on-top of master, - add patch to not build the documentation, because simply touching flex.1 is no longer enough. - keep install in target/, for shared builds ] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Adrian Perez de Castro Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/flex/0001-flex-disable-documentation.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 package/flex/0001-flex-disable-documentation.patch (limited to 'package/flex/0001-flex-disable-documentation.patch') diff --git a/package/flex/0001-flex-disable-documentation.patch b/package/flex/0001-flex-disable-documentation.patch deleted file mode 100644 index b017b41385..0000000000 --- a/package/flex/0001-flex-disable-documentation.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a98443c6a72d5821d4e0152311e5c3eb4cdff25c Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -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: - -Making all in doc -make[2]: Entering directory '/br/output/build/flex-2.6.4/doc' -make[2]: *** No rule to make target '../src/flex', needed by 'flex.1'. -Stop. - -Signed-off-by: Vicente Olivert Riera -[Adrian: patch Makefile.am instead of Makefile.in] -Signed-off-by: Adrian Perez de Castro ---- - Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -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 - -- cgit v1.2.3