diff options
| author | Juergen Daubert <jue@jue.li> | 2017-01-05 16:51:12 +0100 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2017-01-05 16:51:12 +0100 |
| commit | c861c525d83bc0c2ab1ca0134beede2e2ad2752a (patch) | |
| tree | 0eb13b64f5c51b4bd7b3a95d997fc91a23617cfc /flex | |
| parent | bd28a27479cbcd36a5ddcfd915d3c43b9fcb2598 (diff) | |
| parent | 829541cef904c701d644551c0785001e2a8764f7 (diff) | |
| download | core-c861c525d83bc0c2ab1ca0134beede2e2ad2752a.tar.gz core-c861c525d83bc0c2ab1ca0134beede2e2ad2752a.tar.xz | |
Merge branch '3.2' into 3.3
Diffstat (limited to 'flex')
| -rw-r--r-- | flex/.footprint | 5 | ||||
| -rw-r--r-- | flex/.md5sum | 2 | ||||
| -rw-r--r-- | flex/Pkgfile | 4 | ||||
| -rw-r--r-- | flex/flex-2.6.0-2.patch | 19 |
4 files changed, 3 insertions, 27 deletions
diff --git a/flex/.footprint b/flex/.footprint index f7aa39f6..5e874fdd 100644 --- a/flex/.footprint +++ b/flex/.footprint @@ -11,11 +11,6 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libfl.so -> libfl.so.2.0.0 lrwxrwxrwx root/root usr/lib/libfl.so.2 -> libfl.so.2.0.0 -rwxr-xr-x root/root usr/lib/libfl.so.2.0.0 --rw-r--r-- root/root usr/lib/libfl_pic.a --rwxr-xr-x root/root usr/lib/libfl_pic.la -lrwxrwxrwx root/root usr/lib/libfl_pic.so -> libfl_pic.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libfl_pic.so.2 -> libfl_pic.so.2.0.0 --rwxr-xr-x root/root usr/lib/libfl_pic.so.2.0.0 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/flex/.md5sum b/flex/.md5sum index 19ee67cb..616f8d81 100644 --- a/flex/.md5sum +++ b/flex/.md5sum @@ -1 +1 @@ -cd3c86290fc2676a641aefafeb10848a flex-2.6.1.tar.xz +a5f65570cd9107ec8a8ec88f17b31bb1 flex-2.6.3.tar.gz diff --git a/flex/Pkgfile b/flex/Pkgfile index b89d668c..73fd5104 100644 --- a/flex/Pkgfile +++ b/flex/Pkgfile @@ -3,9 +3,9 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=flex -version=2.6.1 +version=2.6.3 release=1 -source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.xz) +source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz) build() { cd $name-$version diff --git a/flex/flex-2.6.0-2.patch b/flex/flex-2.6.0-2.patch deleted file mode 100644 index 69707d19..00000000 --- a/flex/flex-2.6.0-2.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 07d89829cce4527c7614a34642d4b2c2ef5d6005 -Author: Will Estes <westes575@gmail.com> -Date: Fri Dec 11 09:45:14 2015 -0500 - - Commented in C style in skeleton; fixed sf#195 - -diff --git a/src/flex.skl b/src/flex.skl -index b63c8c8..40287b6 100644 ---- a/src/flex.skl -+++ b/src/flex.skl -@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ -- num_to_alloc = 1; // After all that talk, this was set to 1 anyways... -+ num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - M4_YY_CALL_LAST_ARG); |