jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-05 17:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

flex: remove deprecated binary in target

Browse Source 
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>
This commit is contained in:
Gustavo Zacarias 2015-01-15 11:30:21 -03:00 committed by Peter Korsgaard
parent 3dafe02476
commit aa6ea7aba3
4 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Config.in.legacy
View File

@ -102,6 +102,14 @@ endif
comment "Legacy options removed in 2015.02" comment "Legacy options removed in 2015.02"
config BR2_PACKAGE_FLEX_BINARY
bool "flex binary in target option removed"
select BR2_LEGACY
help
The flex binary in the target option has been removed.
It's been deprecated for some time now and is essentially a
development tool which isn't very useful in the target.
config BR2_PACKAGE_BISON config BR2_PACKAGE_BISON
bool "bison target package removed" bool "bison target package removed"
select BR2_LEGACY select BR2_LEGACY

0
package/flex/flex-prog-ar.patch → package/flex/0001-prog-ar.patch
View File

21
package/flex/Config.in
View File

@ -6,24 +6,3 @@ config BR2_PACKAGE_FLEX
programs that perform pattern-matching on text. programs that perform pattern-matching on text.
http://flex.sourceforge.net/ 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

11
package/flex/flex.mk
View File

@ -15,15 +15,6 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
# we don't have a host-gettext/libintl # we don't have a host-gettext/libintl
HOST_FLEX_DEPENDENCIES = host-m4 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 define FLEX_DISABLE_PROGRAM
$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in $(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
endef endef
@ -35,7 +26,5 @@ define FLEX_REMOVE_BROKEN_SYMLINK
endef endef
FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK
endif
$(eval $(autotools-package)) $(eval $(autotools-package))
$(eval $(host-autotools-package)) $(eval $(host-autotools-package))