Commit 3b91aadf authored by Manuel's avatar Manuel

Update

parent c6e27c44
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=flex
pkgver=2.5.35
pkgrel=5
pkgver=2.5.37
pkgrel=1
pkgdesc="A tool for generating text-scanning programs"
arch=('i686' 'x86_64')
url="http://flex.sourceforge.net"
......@@ -13,36 +8,33 @@ license=('custom')
groups=('base-devel')
depends=('glibc' 'm4' 'sh')
install=flex.install
source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
flex-2.5.35-gcc44.patch
flex-2.5.35-hardening.patch
flex-2.5.35-missing-prototypes.patch
flex-2.5.35-sign.patch
lex.sh)
md5sums=('10714e50cea54dc7a227e3eddcd44d57'
'e4444ef5c07db71a43280be74139bdea'
'de952b3ed7cc074bc8c3e6ab73634048'
'6b83f56b1b654c6a321cdc530a3ec68d'
'd87fd9e9762ba7e230d516bdcf1c8c6f'
source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
lex.sh)
md5sums=('c75940e1fc25108f2a7b3ef42abdae06'
'f725259ec23a9e87ee29e2ef82eda9a5')
build() {
cd $srcdir/$pkgname-$pkgver || return 1
patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch || return 1
patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch || return 1
patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch || return 1
patch -Np1 -i $srcdir/flex-2.5.35-sign.patch || return 1
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr
make
}
check() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr \
--mandir=/usr/share/man --infodir=/usr/share/info || return 1
make || return 1
make prefix=$pkgdir/usr \
mandir=$pkgdir/usr/share/man \
infodir=$pkgdir/usr/share/info \
install || return 1
install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex || return 1
# these tests used features removed in bison-2.6
sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in
make check
}
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
install -Dm644 COPYING \
$pkgdir/usr/share/licenses/$pkgname/license.txt || return 1
$pkgdir/usr/share/licenses/$pkgname/license.txt
}
diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl
--- flex-2.5.35.orig/flex.skl 2009-04-20 03:09:46.000000000 +0530
+++ flex-2.5.35/flex.skl 2009-04-20 07:46:58.000000000 +0530
@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h')
/* begin standard C++ headers. */
#include <iostream>
#include <errno.h>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
/* end standard C++ headers. */
diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
--- flex-2.5.35.orig/skel.c 2009-04-20 03:09:46.000000000 +0530
+++ flex-2.5.35/skel.c 2009-04-20 07:46:40.000000000 +0530
@@ -284,6 +284,7 @@ const char *skel[] = {
"/* begin standard C++ headers. */",
"#include <iostream> ",
"#include <errno.h>",
+ "#include <cstdio>",
"#include <cstdlib>",
"#include <cstring>",
"/* end standard C++ headers. */",
diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
--- flex-2.5.35/scan.c
+++ flex-2.5.35/scan.c
@@ -2096,7 +2096,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
--- flex-2.5.35/flex.skl
+++ flex-2.5.35/flex.skl
@@ -1075,7 +1075,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
%endif
%if-c++-only C++ definition
#define ECHO LexerOutput( yytext, yyleng )
diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
--- flex-2.5.35/skel.c
+++ flex-2.5.35/skel.c
@@ -1142,7 +1142,7 @@
"/* This used to be an fputs(), but since the string might contain NUL's,",
" * we now use fwrite().",
" */",
- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
"%endif",
"%if-c++-only C++ definition",
"#define ECHO LexerOutput( yytext, yyleng )",
diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
--- flex-2.5.35/flex.skl~ 2010-07-13 17:18:43.000000000 +0200
+++ flex-2.5.35/flex.skl 2010-07-13 17:23:49.000000000 +0200
@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
]])
+m4_ifdef( [[M4_YY_REENTRANT]],
+[[
+m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
+[[
+int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
+]])
+]])
+
+m4_ifdef( [[M4_YY_REENTRANT]],
+[[
+m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
+[[
+void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
+]])
+]])
+
%if-bison-bridge
m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
[[
Diff finished. Tue Jul 13 17:27:50 2010
--- flex-2.5.35/skel.c~ 2010-07-14 13:15:42.000000000 +0200
+++ flex-2.5.35/skel.c 2010-07-14 13:16:05.000000000 +0200
@@ -1027,6 +1027,22 @@
"void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
"]])",
"",
+ "m4_ifdef( [[M4_YY_REENTRANT]],",
+ "[[",
+ "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
+ "[[",
+ "int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+ "]])",
+ "]])",
+ "",
+ "m4_ifdef( [[M4_YY_REENTRANT]],",
+ "[[",
+ "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
+ "[[",
+ "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
+ "]])",
+ "]])",
+ "",
"%if-bison-bridge",
"m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
"[[",
--- flex-2.5.35/gen.c-orig 2008-04-30 22:51:08.000000000 +0200
+++ flex-2.5.35/gen.c 2008-04-30 22:51:14.000000000 +0200
@@ -1890,7 +1890,7 @@
outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
outn ("\t\t{ \\");
outn ("\t\tint c = '*'; \\");
- outn ("\t\tint n; \\");
+ outn ("\t\tunsigned n; \\");
outn ("\t\tfor ( n = 0; n < max_size && \\");
outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
outn ("\t\t\tbuf[n] = (char) c; \\");
......@@ -18,5 +18,3 @@ pre_remove() {
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
# vim:set ts=2 sw=2 et:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment