| Message ID | 1369606110-8088-8-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | fe6a9e5e9d4046173a60235f8fd9a3b4746929c6 |
| Headers | show |
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> For proper runtime execution, flex requires m4 to be
Thomas> installed. Passing a M4 variable at configure time is needed,
Thomas> otherwise flex on the target will try to use a 'm4' binary with a
Thomas> build machine path.
Thomas> Fixes bug #4988.
Committed, thanks.
diff --git a/package/flex/Config.in b/package/flex/Config.in index f74a0f0..1ecd0c3 100644 --- a/package/flex/Config.in +++ b/package/flex/Config.in @@ -12,5 +12,7 @@ config BR2_PACKAGE_FLEX_BINARY # needs fork() depends on BR2_USE_MMU depends on BR2_PACKAGE_FLEX + # runtime dependency + select BR2_PACKAGE_M4 help Install the flex binary tool in the target filesystem. diff --git a/package/flex/flex.mk b/package/flex/flex.mk index f7e319f..748365b 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -11,6 +11,7 @@ FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING FLEX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4 +FLEX_CONF_ENV = M4=/usr/bin/m4 # we don't have a host-gettext/libintl HOST_FLEX_DEPENDENCIES = host-m4
For proper runtime execution, flex requires m4 to be installed. Passing a M4 variable at configure time is needed, otherwise flex on the target will try to use a 'm4' binary with a build machine path. Fixes bug #4988. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/flex/Config.in | 2 ++ package/flex/flex.mk | 1 + 2 files changed, 3 insertions(+)