X-Git-Url: http://gitweb/?a=blobdiff_plain;f=flex%2FPkgfile;h=805f3318b4b891be892e8a6c5c4601609d200b44;hb=fa6cd34777268040e8d88ae86dcdaa984a3a8710;hp=e7534fb3afaa7b5f73566627cbcc62daa0af7cc8;hpb=fe8f5c156b498e840650faedabc1b0d258b93044;p=crossrootfs.git

diff --git a/flex/Pkgfile b/flex/Pkgfile
index e7534fb..805f331 100644
--- a/flex/Pkgfile
+++ b/flex/Pkgfile
@@ -5,9 +5,10 @@
 # Depends on:
 
 name=flex
-version=2.5.39
+version=2.6.3
 release=2
-source=(http://downloads.sourceforge.net/project/$name/$name-$version.tar.bz2)
+source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz
+        $name-$version-add_defines.patch)
 
 build() {
   cd $name-$version
@@ -15,13 +16,32 @@ build() {
   echo "ac_cv_func_malloc_0_nonnull=yes" > config.cache 
   echo "ac_cv_func_realloc_0_nonnull=yes" >> config.cache
 
+  patch -p1 -i $SRC/$name-$version-add_defines.patch
+  touch doc/flex.1
+
+  # Don't build tests
+  sed '51d' -i Makefile.am
+
+  # Build stage1flex for current host
+  CC=gcc CFLAGS="" ./configure --disable-nls \
+                               --prefix=/tools \
+                               --enable-shared 
+
+  make -C lib
+  make -C src stage1flex
+  mv src/stage1flex src/stage1flex.host
+  make distclean
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
               --disable-nls \
               --cache-file=config.cache
 
-  make
+  make -C lib
+  # Use stage1flex built for host
+  sed 's|./stage1flex$(EXEEXT) $(AM_LFLAGS)|./stage1flex.host$(EXEEXT) $(AM_LFLAGS)|g' -i src/Makefile
+  make -C src 
   make DESTDIR=$PKG install
 
   ln -sf flex $PKG/usr/bin/lex