diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-01-15 11:30:21 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-01-26 00:21:35 +0100 |
| commit | aa6ea7aba3a9a0edd5c8618a83240f4a66263286 (patch) | |
| tree | d6e4b57bf8e607c8e7fa1be35e7dbe2864aa1527 /package/flex | |
| parent | 3dafe024764a9e7b4a1c89a0ecc8047f6d4c2f2c (diff) | |
flex: remove deprecated binary in target
It's been deprecated for a year now so remove the option.
Also rename patch to new naming convention.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/flex')
| -rw-r--r-- | package/flex/0001-prog-ar.patch (renamed from package/flex/flex-prog-ar.patch) | 0 | ||||
| -rw-r--r-- | package/flex/Config.in | 21 | ||||
| -rw-r--r-- | package/flex/flex.mk | 11 |
3 files changed, 0 insertions, 32 deletions
diff --git a/package/flex/flex-prog-ar.patch b/package/flex/0001-prog-ar.patch index e0626ff95..e0626ff95 100644 --- a/package/flex/flex-prog-ar.patch +++ b/package/flex/0001-prog-ar.patch diff --git a/package/flex/Config.in b/package/flex/Config.in index 9ac600da4..7199c6a58 100644 --- a/package/flex/Config.in +++ b/package/flex/Config.in @@ -6,24 +6,3 @@ config BR2_PACKAGE_FLEX programs that perform pattern-matching on text. http://flex.sourceforge.net/ - -if BR2_PACKAGE_FLEX - -config BR2_PACKAGE_FLEX_BINARY - bool "Install flex binary on target" - # needs fork() - depends on BR2_USE_MMU - # runtime dependency - select BR2_PACKAGE_M4 - # development tool, useless on the target - depends on BR2_DEPRECATED_SINCE_2014_02 - depends on BR2_USE_WCHAR # m4 - help - Install the flex binary tool in the target filesystem. - -comment "flex binary needs a toolchain w/ wchar" - depends on BR2_DEPRECATED_SINCE_2014_02 - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR - -endif diff --git a/package/flex/flex.mk b/package/flex/flex.mk index cd92dd7b0..9a3f840b1 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -15,15 +15,6 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 # we don't have a host-gettext/libintl HOST_FLEX_DEPENDENCIES = host-m4 -ifeq ($(BR2_PACKAGE_FLEX_BINARY),y) -# lex -> flex -define FLEX_INSTALL_LEX - cd $(TARGET_DIR)/usr/bin && ln -snf flex lex -endef -FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX - -else - define FLEX_DISABLE_PROGRAM $(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in endef @@ -35,7 +26,5 @@ define FLEX_REMOVE_BROKEN_SYMLINK endef FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package)) |