* [Buildroot] svn commit: trunk/buildroot/package/flex
@ 2007-01-19 14:55 aldot at uclibc.org
0 siblings, 0 replies; 3+ messages in thread
From: aldot at uclibc.org @ 2007-01-19 14:55 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-01-19 06:54:58 -0800 (Fri, 19 Jan 2007)
New Revision: 17381
Log:
- bump version
Added:
trunk/buildroot/package/flex/flex-2.5.33-prog-ar.patch
Modified:
trunk/buildroot/package/flex/flex.mk
Changeset:
Added: trunk/buildroot/package/flex/flex-2.5.33-prog-ar.patch
===================================================================
--- trunk/buildroot/package/flex/flex-2.5.33-prog-ar.patch (rev 0)
+++ trunk/buildroot/package/flex/flex-2.5.33-prog-ar.patch 2007-01-19 14:54:58 UTC (rev 17381)
@@ -0,0 +1,22 @@
+diff -rup flex-2.5.33.orig/Makefile flex-2.5.33/Makefile
+--- flex-2.5.33.orig/Makefile 2007-01-18 17:29:32.000000000 +0100
++++ flex-2.5.33/Makefile 2007-01-18 18:28:29.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 =
+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 =
Modified: trunk/buildroot/package/flex/flex.mk
===================================================================
--- trunk/buildroot/package/flex/flex.mk 2007-01-19 14:17:34 UTC (rev 17380)
+++ trunk/buildroot/package/flex/flex.mk 2007-01-19 14:54:58 UTC (rev 17381)
@@ -3,10 +3,12 @@
# flex
#
#############################################################
-FLEX_SOURCE:=flex_2.5.4a.orig.tar.gz
-FLEX_PATCH:=flex_2.5.4a-24.diff.gz
+FLEX_VERSION:=2.5.33
+FLEX_PATCH_VERSION:=10
+FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
+FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
FLEX_SITE:=http://ftp.debian.org/debian/pool/main/f/flex
-FLEX_DIR:=$(BUILD_DIR)/flex-2.5.4
+FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION)
FLEX_CAT:=$(ZCAT)
FLEX_BINARY:=flex
FLEX_TARGET_BINARY:=usr/bin/flex
@@ -21,11 +23,16 @@
$(FLEX_DIR)/.unpacked: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
$(FLEX_CAT) $(DL_DIR)/$(FLEX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- #toolchain/patch-kernel.sh $(FLEX_DIR) $(DL_DIR) $(FLEX_PATCH)
- touch $(FLEX_DIR)/.unpacked
+ifneq ($(FLEX_PATCH),)
+ toolchain/patch-kernel.sh $(FLEX_DIR) $(DL_DIR) $(FLEX_PATCH)
+ if [ -d $(FLEX_DIR)/debian/patches ]; then \
+ toolchain/patch-kernel.sh $(FLEX_DIR) $(FLEX_DIR)/debian/patches \*.patch ; \
+ fi
+endif
+ touch $@
$(FLEX_DIR)/.configured: $(FLEX_DIR)/.unpacked
- (cd $(FLEX_DIR); autoconf; rm -rf config.cache; \
+ (cd $(FLEX_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
./configure \
@@ -43,13 +50,14 @@
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
+ --includedir=$(TARGET_DIR)/usr/include \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
);
- touch $(FLEX_DIR)/.configured
+ touch $@
$(FLEX_DIR)/$(FLEX_BINARY): $(FLEX_DIR)/.configured
- $(MAKE) -C $(FLEX_DIR)
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(FLEX_DIR)
$(TARGET_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY)
$(MAKE1) \
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/flex
@ 2007-02-03 21:05 andersen at uclibc.org
0 siblings, 0 replies; 3+ messages in thread
From: andersen at uclibc.org @ 2007-02-03 21:05 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-02-03 13:05:53 -0800 (Sat, 03 Feb 2007)
New Revision: 17744
Log:
new patch version
Modified:
trunk/buildroot/package/flex/flex.mk
Changeset:
Modified: trunk/buildroot/package/flex/flex.mk
===================================================================
--- trunk/buildroot/package/flex/flex.mk 2007-02-03 20:52:33 UTC (rev 17743)
+++ trunk/buildroot/package/flex/flex.mk 2007-02-03 21:05:53 UTC (rev 17744)
@@ -4,7 +4,7 @@
#
#############################################################
FLEX_VERSION:=2.5.33
-FLEX_PATCH_VERSION:=10
+FLEX_PATCH_VERSION:=11
FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
FLEX_SITE:=http://ftp.debian.org/debian/pool/main/f/flex
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/flex
@ 2007-11-29 13:03 ulf at uclibc.org
0 siblings, 0 replies; 3+ messages in thread
From: ulf at uclibc.org @ 2007-11-29 13:03 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-29 05:03:56 -0800 (Thu, 29 Nov 2007)
New Revision: 20586
Log:
Use /usr/lib instead of /lib for flex
Modified:
trunk/buildroot/package/flex/Config.in
trunk/buildroot/package/flex/flex.mk
Changeset:
Modified: trunk/buildroot/package/flex/Config.in
===================================================================
--- trunk/buildroot/package/flex/Config.in 2007-11-29 13:02:58 UTC (rev 20585)
+++ trunk/buildroot/package/flex/Config.in 2007-11-29 13:03:56 UTC (rev 20586)
@@ -8,9 +8,9 @@
http://www.gnu.org/software/flex/
config BR2_PACKAGE_FLEX_LIBFL
- bool "Install libfl.a under staging_dir/lib"
+ bool "Install libfl.a under staging_dir/usr/lib"
default y
depends on BR2_PACKAGE_FLEX
help
- Install libfl.a under staging_dir/lib for further development
+ Install libfl.a under staging_dir/usr/lib for further development
on a host machine.
Modified: trunk/buildroot/package/flex/flex.mk
===================================================================
--- trunk/buildroot/package/flex/flex.mk 2007-11-29 13:02:58 UTC (rev 20585)
+++ trunk/buildroot/package/flex/flex.mk 2007-11-29 13:03:56 UTC (rev 20586)
@@ -77,7 +77,7 @@
includedir=$(TARGET_DIR)/usr/include \
-C $(FLEX_DIR) install
ifeq ($(strip $(BR2_PACKAGE_FLEX_LIBFL)),y)
- install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/lib/libfl.a
+ install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
endif
ifneq ($(BR2_HAVE_INFOPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/info
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-11-29 13:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-03 21:05 [Buildroot] svn commit: trunk/buildroot/package/flex andersen at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-11-29 13:03 ulf at uclibc.org
2007-01-19 14:55 aldot at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox