[Astlinux-commits] SF.net SVN: astlinux:[6917] branches/1.0

[<abe...@us...>]

Revision: 6917
          http://sourceforge.net/p/astlinux/code/6917
Author:   abelbeck
Date:     2015-01-09 17:37:39 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
host-flex, version bump to 2.5.37 and cleanup

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/astlinux18.config
    branches/1.0/package/flex/Config.in
    branches/1.0/package/flex/flex.mk

Added Paths:
-----------
    branches/1.0/package/flex/flex-prog-ar.patch

Removed Paths:
-------------
    branches/1.0/package/flex/flex-2.5.33-prog-ar.patch

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/astlinux-ast11.config	2015-01-09 17:37:39 UTC (rev 6917)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan  3 11:05:37 2015
+# Buildroot 2011.08-svn6916-dirty Configuration
+# Fri Jan  9 10:34:36 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -267,7 +267,6 @@
 # BR2_PACKAGE_CVS is not set
 # BR2_PACKAGE_DISTCC is not set
 BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
 # BR2_PACKAGE_GMP is not set
 # BR2_PACKAGE_GPERF is not set
 # BR2_PACKAGE_MAKE is not set

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/astlinux-ast13.config	2015-01-09 17:37:39 UTC (rev 6917)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6899-dirty Configuration
-# Sat Jan  3 18:34:03 2015
+# Buildroot 2011.08-svn6916-dirty Configuration
+# Fri Jan  9 10:34:36 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -267,7 +267,6 @@
 # BR2_PACKAGE_CVS is not set
 # BR2_PACKAGE_DISTCC is not set
 BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
 # BR2_PACKAGE_GMP is not set
 # BR2_PACKAGE_GPERF is not set
 # BR2_PACKAGE_MAKE is not set

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/astlinux18.config	2015-01-09 17:37:39 UTC (rev 6917)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan  3 11:05:34 2015
+# Buildroot 2011.08-svn6916-dirty Configuration
+# Fri Jan  9 10:34:36 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -267,7 +267,6 @@
 # BR2_PACKAGE_CVS is not set
 # BR2_PACKAGE_DISTCC is not set
 BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
 # BR2_PACKAGE_GMP is not set
 # BR2_PACKAGE_GPERF is not set
 # BR2_PACKAGE_MAKE is not set

Modified: branches/1.0/package/flex/Config.in
===================================================================
--- branches/1.0/package/flex/Config.in	2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/package/flex/Config.in	2015-01-09 17:37:39 UTC (rev 6917)
@@ -4,12 +4,5 @@
 	  A fast lexical analyser generator.  A tool for generating
 	  programs that perform pattern-matching on text.
 
-	  http://www.gnu.org/software/flex/
+	  http://flex.sourceforge.net/
 
-config BR2_PACKAGE_FLEX_LIBFL
-	bool "Install libfl.a under staging_dir/usr/lib"
-	default y
-	depends on BR2_PACKAGE_FLEX
-	help
-	  Install libfl.a under staging_dir/usr/lib for further development
-	  on a host machine.

Deleted: branches/1.0/package/flex/flex-2.5.33-prog-ar.patch
===================================================================
--- branches/1.0/package/flex/flex-2.5.33-prog-ar.patch	2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/package/flex/flex-2.5.33-prog-ar.patch	2015-01-09 17:37:39 UTC (rev 6917)
@@ -1,11 +0,0 @@
-diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
---- flex-2.5.33.orig/Makefile.in	2007-01-18 17:29:25.000000000 +0100
-+++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000 +0100
-@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- 	"$(DESTDIR)$(includedir)"
- libLIBRARIES_INSTALL = $(INSTALL_DATA)
- LIBRARIES = $(lib_LIBRARIES)
--AR = ar
- ARFLAGS = cru
- libfl_a_AR = $(AR) $(ARFLAGS)
- libfl_a_LIBADD =

Copied: branches/1.0/package/flex/flex-prog-ar.patch (from rev 6916, branches/1.0/package/flex/flex-2.5.33-prog-ar.patch)
===================================================================
--- branches/1.0/package/flex/flex-prog-ar.patch	                        (rev 0)
+++ branches/1.0/package/flex/flex-prog-ar.patch	2015-01-09 17:37:39 UTC (rev 6917)
@@ -0,0 +1,10 @@
+--- flex-2.5.37/Makefile.in.orig	2015-01-09 10:26:23.000000000 -0600
++++ flex-2.5.37/Makefile.in	2015-01-09 10:26:48.000000000 -0600
+@@ -119,7 +119,6 @@
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ 	"$(DESTDIR)$(docdir)" "$(DESTDIR)$(includedir)"
+ LIBRARIES = $(lib_LIBRARIES)
+-AR = ar
+ ARFLAGS = cru
+ libfl_a_AR = $(AR) $(ARFLAGS)
+ libfl_a_LIBADD =

Modified: branches/1.0/package/flex/flex.mk
===================================================================
--- branches/1.0/package/flex/flex.mk	2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/package/flex/flex.mk	2015-01-09 17:37:39 UTC (rev 6917)
@@ -3,42 +3,26 @@
 # flex
 #
 #############################################################
-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_VERSION = 2.5.37
+FLEX_SOURCE = flex-$(FLEX_VERSION).tar.gz
+FLEX_SITE = http://download.sourceforge.net/project/flex
 FLEX_INSTALL_STAGING=YES
-FLEX_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
-	$(if $(BR2_PACKAGE_LIBINTL),libintl)
+FLEX_DEPENDENCIES = host-m4
+HOST_FLEX_DEPENDENCIES = host-m4
 
-# lex -> flex
-define FLEX_INSTALL_LEX
-cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
-endef
+FLEX_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4
+HOST_FLEX_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4
 
-define FLEX_UNINSTALL_LEX
--rm $(TARGET_DIR)/usr/bin/lex
+define FLEX_DISABLE_PROGRAM
+	$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
 endef
+FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
 
-FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX
-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
+# flex++ symlink is broken when flex binary is not installed
+define FLEX_REMOVE_BROKEN_SYMLINK
+	rm -f $(TARGET_DIR)/usr/bin/flex++
 endef
+FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK
 
-define FLEX_UNINSTALL_LIBFL
--rm $(STAGING_DIR)/lib/libfl.a
-endef
-
-FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL
-FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LIBFL
-endif
-
 $(eval $(call AUTOTARGETS,package,flex))
 $(eval $(call AUTOTARGETS,package,flex,host))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.