packages: flex/flex.spec, flex/flex-gcc44.patch (NEW), flex/flex-missing-pr...

qboosh qboosh at pld-linux.org
Thu Nov 25 09:15:05 CET 2010 

Author: qboosh                       Date: Thu Nov 25 08:15:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added gcc44,missing-prototypes,sign patches from Fedora (error or warning fixes)
- outdated (no longer applying) m4-quotes patch left for still valid testcase
- passing -fPIC through specflags is not valid (not used in debug builds);
  also, libfl_pic.a (-lfl_pic) instead of libfl.a should be used where PIC is needed

---- Files affected:
packages/flex:
   flex.spec (1.80 -> 1.81) , flex-gcc44.patch (NONE -> 1.1)  (NEW), flex-missing-prototypes.patch (NONE -> 1.1)  (NEW), flex-sign.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/flex/flex.spec
diff -u packages/flex/flex.spec:1.80 packages/flex/flex.spec:1.81
--- packages/flex/flex.spec:1.80	Sun May 16 14:11:28 2010
+++ packages/flex/flex.spec	Thu Nov 25 09:14:59 2010
@@ -1,5 +1,7 @@
 # $Revision$, $Date$
 # NOTE: don't use 2.5.34, it's too broken? is 2.5.35 ok? how to test?
+# NOTE: 2.5.35+ can't deal with "[[" "]]" strings in sources, needs workarounds like space separation
+#       (or update of m4-quotes patch)
 Summary:	GNU fast lexical analyzer generator
 Summary(de.UTF-8):	GNU - schneller lexikalischer Analysegenerator
 Summary(es.UTF-8):	Generador rápido de analizadores léxicos de la GNU
@@ -19,26 +21,28 @@
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	fd79ee2834b290e74c626f0bbfc8942f
 Patch0:		%{name}-info.patch
-Patch2:		%{name}-locale.patch
-# patch #869230 (second version of bug #720983 fix)
-#Patch3:	%{name}-m4-quotes.diff
+Patch1:		%{name}-locale.patch
+Patch2:		%{name}-gcc44.patch
+Patch3:		%{name}-missing-prototypes.patch
+Patch4:		%{name}-sign.patch
+# patch #869230 (second version of bug #720983 fix - from flex BTS)
+# outdated as for 2.5.34+, but contains testcase
+Patch5:		%{name}-m4-quotes.diff
 URL:		http://flex.sourceforge.net/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	bison
-# m4-quotes* patches require rebuilding *.c from scan.l
-BuildRequires:	flex
+# to rebuild scan.c from scan.l (m4-quotes patch)
+#BuildRequires:	flex
 BuildRequires:	gettext-devel >= 0.11.5
 BuildRequires:	help2man
+# to rebuild skel.c from patched flex.skl
+BuildRequires:	m4
 BuildRequires:	texinfo
 BuildRequires:	util-linux
 Requires:	m4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_amd64		-fPIC
-%define		specflags_ia32e		-fPIC
-%define		specflags_x86_64	-fPIC
-
 %description
 This is the GNU fast lexical analyzer generator. It generates lexical
 tokenizing code based on a lexical (regular expression based)
@@ -127,8 +131,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
+%patch4 -p1
+#%patch5 -p1
 
 # force regeneration (just in case make didn't want to)
 rm -f skel.c
@@ -168,23 +175,28 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p	/sbin/postshell
+%post	-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun	-p	/sbin/postshell
+%postun	-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/flex
+%attr(755,root,root) %{_bindir}/flex++
+%attr(755,root,root) %{_bindir}/lex
+%{_mandir}/man1/flex.1*
+%{_mandir}/man1/flex++.1*
+%{_mandir}/man1/lex.1*
 %lang(es) %{_mandir}/es/man1/*
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
-%{_infodir}/flex*
-%{_libdir}/*.a
-%{_includedir}/*.h
+%{_infodir}/flex.info*
+%{_libdir}/libfl.a
+%{_libdir}/libfl_pic.a
+%{_includedir}/FlexLexer.h
 
 %files examples
 %defattr(644,root,root,755)
@@ -196,6 +208,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2010/11/25 08:14:59  qboosh
+- added gcc44,missing-prototypes,sign patches from Fedora (error or warning fixes)
+- outdated (no longer applying) m4-quotes patch left for still valid testcase
+- passing -fPIC through specflags is not valid (not used in debug builds);
+  also, libfl_pic.a (-lfl_pic) instead of libfl.a should be used where PIC is needed
+
 Revision 1.80  2010/05/16 12:11:28  glen
 - up to 2.5.35, can't find bug #720983 for -m4-quotes.diff patch
 

================================================================
Index: packages/flex/flex-gcc44.patch
diff -u /dev/null packages/flex/flex-gcc44.patch:1.1
--- /dev/null	Thu Nov 25 09:15:05 2010
+++ packages/flex/flex-gcc44.patch	Thu Nov 25 09:14:59 2010
@@ -0,0 +1,11 @@
+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. */

================================================================
Index: packages/flex/flex-missing-prototypes.patch
diff -u /dev/null packages/flex/flex-missing-prototypes.patch:1.1
--- /dev/null	Thu Nov 25 09:15:05 2010
+++ packages/flex/flex-missing-prototypes.patch	Thu Nov 25 09:14:59 2010
@@ -0,0 +1,26 @@
+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]],,
+ [[

================================================================
Index: packages/flex/flex-sign.patch
diff -u /dev/null packages/flex/flex-sign.patch:1.1
--- /dev/null	Thu Nov 25 09:15:05 2010
+++ packages/flex/flex-sign.patch	Thu Nov 25 09:14:59 2010
@@ -0,0 +1,11 @@
+--- 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; \\");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/flex/flex.spec?r1=1.80&r2=1.81&f=u

More information about the pld-cvs-commit mailing list