rpms/flex/devel flex-2.5.4a-Makefile.in.patch, NONE, 1.1 flex.spec, 1.25, 1.26 test-183098.sh, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: pmachata

Update of /cvs/dist/rpms/flex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8057

Modified Files:
	flex.spec test-183098.sh 
Added Files:
	flex-2.5.4a-Makefile.in.patch 
Log Message:
- Caught the real cause of #183098.  It failed because the parser
  built with `flex -f' *sometimes* made it into the final package, and
  -f assumes seven-bit tables.  Solution has two steps.  Move `make
  bigcheck' to `%%check' part, where it belongs anyway, so that flexes
  built during `make bigcheck' don't overwrite original build.  And
  change makefile so that `make bigcheck' will *always* execute *all*
  check commands.



flex-2.5.4a-Makefile.in.patch:
 Makefile.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE flex-2.5.4a-Makefile.in.patch ---
--- flex-2.5.4/Makefile.in	2006-03-09 19:28:41.000000000 +0100
+++ flex-2.5.4/Makefile.in_new	2006-03-09 19:29:48.000000000 +0100
@@ -114,6 +114,7 @@ scan.c: scan.l
 	$(FLEX_EXEC) $(FLEX_FLAGS) $(COMPRESSION) $(srcdir)/scan.l >scan.c
 	@sed s,\"$(srcdir)/scan.l\",\"scan.l\", <scan.c >scan.tmp
 	@mv scan.tmp scan.c
+	-rm $(FLEX)
 
 scan.o: scan.c parse.h flexdef.h config.h
 yylex.o: yylex.c parse.h flexdef.h config.h
@@ -146,7 +147,7 @@ alloca.c: $(srcdir)/MISC/alloca.c
 	cp $(srcdir)/MISC/alloca.c .
 
 test: check
-check: $(FLEX)
+check: scan.c $(FLEX)
 	$(FLEX_EXEC) $(FLEX_FLAGS) $(COMPRESSION) $(srcdir)/scan.l \
 	| sed s,\"$(srcdir)/scan.l\",\"scan.l\", \
 	| diff scan.c -
@@ -160,7 +161,7 @@ bigcheck:
 	rm -f scan.c ; $(MAKE) COMPRESSION="-Cfea" check
 	rm -f scan.c ; $(MAKE) COMPRESSION="-CFer" check
 	rm -f scan.c ; $(MAKE) COMPRESSION="-l" PERF_REPORT="" check
-	rm -f scan.c ; $(MAKE)
+	rm -f scan.c ; $(MAKE) check
 	@echo "All checks successful"
 
 $(FLEXLIB): $(LIBOBJS)


Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- flex.spec	8 Mar 2006 13:22:49 -0000	1.25
+++ flex.spec	10 Mar 2006 10:43:35 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 37.4
+Release: 38
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -18,6 +18,7 @@
 Patch7: flex-2.5.4a2-warn.patch
 Patch8: flex-2.5.4a2-shapwarn.patch
 Patch9: flex-2.5.4a2-iniscan.patch
+Patch10: flex-2.5.4a-Makefile.in.patch
 BuildRequires: autoconf, byacc
 
 %description
@@ -46,13 +47,12 @@
 %patch7 -p1 -b .warn
 %patch8 -p1 -b .shapwarn
 %patch9 -p1 -b .iniscan
+%patch10 -p1
 
 %build
 autoconf
 %configure
 make
-make bigcheck
-sh %{SOURCE2}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -66,8 +66,11 @@
   ln -s libfl.a .%{_libdir}/libl.a
 )
 
-#%check
-#make bigcheck
+%check
+echo ============TESTING===============
+sh %{SOURCE2}
+make bigcheck
+echo ============END TESTING===========
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -81,6 +84,15 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Wed Mar  9 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-38
+- Caught the real cause of #183098.  It failed because the parser
+  built with `flex -f' *sometimes* made it into the final package, and
+  -f assumes seven-bit tables.  Solution has two steps.  Move `make
+  bigcheck' to `%%check' part, where it belongs anyway, so that flexes
+  built during `make bigcheck' don't overwrite original build.  And
+  change makefile so that `make bigcheck' will *always* execute *all*
+  check commands.
+
 * Wed Mar  8 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-37.4
 - adding test for #183098 into build process
 


Index: test-183098.sh
===================================================================
RCS file: /cvs/dist/rpms/flex/devel/test-183098.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test-183098.sh	8 Mar 2006 12:25:59 -0000	1.1
+++ test-183098.sh	10 Mar 2006 10:43:35 -0000	1.2
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+if [ "$#" = "1" ]; then
+	FLEX=$1
+else
+	FLEX="./flex"
+fi
+
 LEXFILE=`mktemp`
 CFILE=`mktemp`
 AOUT=`mktemp`
@@ -23,7 +29,7 @@
 }
 '
 ) > ${LEXFILE}
-./flex -o${CFILE} ${LEXFILE}\
+$FLEX -o${CFILE} ${LEXFILE}\
 && gcc -x c ${CFILE} -o ${AOUT}\
 && echo -e '\xc3\x61' | ${AOUT}
 result=$?