diff options
| author | Juergen Daubert <jue@jue.li> | 2012-08-01 12:48:47 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2012-08-01 12:48:47 +0200 |
| commit | 71f4ae6a88895890f6757449f60793589d4ce198 (patch) | |
| tree | 77292d6e7e70992321e86ddc79fd3fa5635f184a /flex | |
| parent | 904ef446a6b4e32df44f483160496ce4d59dfcc0 (diff) | |
| download | core-71f4ae6a88895890f6757449f60793589d4ce198.tar.gz core-71f4ae6a88895890f6757449f60793589d4ce198.tar.xz | |
flex: update to 2.5.36
Diffstat (limited to 'flex')
| -rw-r--r-- | flex/.footprint | 1 | ||||
| -rw-r--r-- | flex/.md5sum | 3 | ||||
| -rw-r--r-- | flex/Pkgfile | 19 | ||||
| -rw-r--r-- | flex/flex-2.5.35-gcc44-1.patch | 24 |
4 files changed, 14 insertions, 33 deletions
diff --git a/flex/.footprint b/flex/.footprint index 40c5fb67..98702d00 100644 --- a/flex/.footprint +++ b/flex/.footprint @@ -1,6 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/flex +lrwxrwxrwx root/root usr/bin/flex++ -> flex lrwxrwxrwx root/root usr/bin/lex -> flex drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/FlexLexer.h diff --git a/flex/.md5sum b/flex/.md5sum index 91c1aba0..78722edf 100644 --- a/flex/.md5sum +++ b/flex/.md5sum @@ -1,2 +1 @@ -ad9109820534278c6dd0898178c0788f flex-2.5.35-gcc44-1.patch -10714e50cea54dc7a227e3eddcd44d57 flex-2.5.35.tar.bz2 +5e637290609fd3c2f1f2e75ac2bce1c5 flex-2.5.36.tar.bz2 diff --git a/flex/Pkgfile b/flex/Pkgfile index f62d7a8b..5e582c3a 100644 --- a/flex/Pkgfile +++ b/flex/Pkgfile @@ -3,18 +3,23 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=flex -version=2.5.35 -release=2 -source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version/$name-$version.tar.bz2 - $name-$version-gcc44-1.patch) +version=2.5.36 +release=1 +source=(http://downloads.sourceforge.net/project/$name/$name-$version.tar.bz2) build() { cd $name-$version - patch -p1 -i $SRC/$name-$version-gcc44-1.patch - ./configure --prefix=/usr --disable-nls + + ./configure --prefix=/usr \ + --mandir=/usr/man \ + --disable-nls + make make DESTDIR=$PKG install + ln -sf flex $PKG/usr/bin/lex ln -sf flex.1.gz $PKG/usr/man/man1/lex.1.gz - rm -rf $PKG/usr/info + + rm -r $PKG/usr/share/{info,doc} + rmdir $PKG/usr/share } diff --git a/flex/flex-2.5.35-gcc44-1.patch b/flex/flex-2.5.35-gcc44-1.patch deleted file mode 100644 index 8f0e80fd..00000000 --- a/flex/flex-2.5.35-gcc44-1.patch +++ /dev/null @@ -1,24 +0,0 @@ -Submitted by: Matt Burgess (matthew at linuxfromscratch dot org) -Date: 2009-05-03 -Initial Package Version: 2.5.35 -Origin: Matt Burgess -Upstream Status: Submitted (attached to sourceforge bug 2178663) -Description: Fixes an error caused by header cleanups in GCC 4.4.0 that is - evident from the test suite and would affect any C++ lexers - generated by Flex. Without this patch, Flex will generate lexers - containing references to the 'EOF' symbol without including the - necessary C++ header file, leading to: - - error: 'EOF' was not declared in this scope - -diff -Naur flex-2.5.35.orig/skel.c flex-2.5.35/skel.c ---- flex-2.5.35.orig/skel.c 2008-02-26 21:34:19.000000000 +0000 -+++ flex-2.5.35/skel.c 2009-05-03 15:18:14.000000000 +0000 -@@ -284,6 +284,7 @@ - "/* begin standard C++ headers. */", - "#include <iostream> ", - "#include <errno.h>", -+ "#include <cstdio>", - "#include <cstdlib>", - "#include <cstring>", - "/* end standard C++ headers. */", |