diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
| commit | c3b72c6cd7b82e70cf61f4eac59f176444eaebf1 (patch) | |
| tree | fe27a5f40b77b826a0bbe7bc2587e4592f74e6c5 /package/flex | |
| parent | c29253ef2e2a473e597637b7ada9fb268dfa8767 (diff) | |
| parent | e3c6b3853ef054efe3ab9800392aec7aa7656dd3 (diff) | |
Merge branch 'next'
And kickoff 2012.02 cycle.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/flex')
| -rw-r--r-- | package/flex/flex-2.5.35-prog-ar.patch (renamed from package/flex/flex-2.5.33-prog-ar.patch) | 0 | ||||
| -rw-r--r-- | package/flex/flex.mk | 23 |
2 files changed, 12 insertions, 11 deletions
diff --git a/package/flex/flex-2.5.33-prog-ar.patch b/package/flex/flex-2.5.35-prog-ar.patch index e0626ff95..e0626ff95 100644 --- a/package/flex/flex-2.5.33-prog-ar.patch +++ b/package/flex/flex-2.5.35-prog-ar.patch diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 706b89d23..df1b4201b 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -3,24 +3,25 @@ # flex # ############################################################# -FLEX_VERSION:=2.5.35 -FLEX_PATCH_VERSION:=9.1 -FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz -FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz -FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex -FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION) -FLEX_INSTALL_STAGING=YES + +FLEX_VERSION = 2.5.35 +FLEX_PATCH_VERSION = 10 +FLEX_SOURCE = flex_$(FLEX_VERSION).orig.tar.gz +FLEX_PATCH = flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz +FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex +FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION) +FLEX_INSTALL_STAGING = YES FLEX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_GETTEXT),gettext) \ $(if $(BR2_PACKAGE_LIBINTL),libintl) # lex -> flex define FLEX_INSTALL_LEX -cd $(TARGET_DIR)/usr/bin && ln -snf flex lex + cd $(TARGET_DIR)/usr/bin && ln -snf flex lex endef define FLEX_UNINSTALL_LEX --rm $(TARGET_DIR)/usr/bin/lex + -rm $(TARGET_DIR)/usr/bin/lex endef FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX @@ -29,11 +30,11 @@ FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LEX # libfl installation ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y) define FLEX_INSTALL_LIBFL -install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a + install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a endef define FLEX_UNINSTALL_LIBFL --rm $(STAGING_DIR)/lib/libfl.a + -rm $(STAGING_DIR)/lib/libfl.a endef FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL |