Revision: 6645
http://ipcop.svn.sourceforge.net/ipcop/?rev=6645&view=rev
Author: gespinasse
Date: 2012-06-09 06:38:05 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
Upgrade bison to 2.5.1
Fix the test suite with -Os as the optimization filter forgot -Os case.
Enable gcc warning and verbose mode to give more visibility at what happen.
Enabling the warning change nothing actually, existing warning disappear if
changing CFLAGS with -O2
No more force #define YYENABLE_NLS 1 as we disable nls for bison :
- that create many test failures,
- this is totally illogical with --disable-nls usage even if 2.5 supported that
- we don't care if bison message are translated as we never set LANG to
something else than C DURING the build
Let a test failure not break the build as this way to test by removing
optimization level look fragile.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/bison
ipcop/trunk/lfs/bison
Modified: ipcop/trunk/config/rootfiles/common/bison
===================================================================
--- ipcop/trunk/config/rootfiles/common/bison 2012-06-07 20:20:11 UTC (rev
6644)
+++ ipcop/trunk/config/rootfiles/common/bison 2012-06-09 06:38:05 UTC (rev
6645)
@@ -1,6 +1,7 @@
#usr/bin/bison
#usr/bin/yacc
#usr/lib/liby.a
+#usr/share/aclocal
#usr/share/aclocal/bison-i18n.m4
#usr/share/bison
#usr/share/bison/README
@@ -19,6 +20,7 @@
#usr/share/bison/m4sugar
#usr/share/bison/m4sugar/foreach.m4
#usr/share/bison/m4sugar/m4sugar.m4
+#usr/share/bison/stack.hh
#usr/share/bison/xslt
#usr/share/bison/xslt/bison.xsl
#usr/share/bison/xslt/xml2dot.xsl
Modified: ipcop/trunk/lfs/bison
===================================================================
--- ipcop/trunk/lfs/bison 2012-06-07 20:20:11 UTC (rev 6644)
+++ ipcop/trunk/lfs/bison 2012-06-09 06:38:05 UTC (rev 6645)
@@ -33,12 +33,12 @@
include Config
PKG_NAME = bison
-VER = 2.5
+VER = 2.5.1
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_GNU)/$(PKG_NAME)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -50,7 +50,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9dba20116b13fc61a0846b0058fbe004
+$(DL_FILE)_MD5 = 012708d801a3c986d8654aa673530b61
install : $(TARGET)
@@ -79,16 +79,20 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- # switch nls off as nothing is include in iso
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && echo '#define YYENABLE_NLS 1' >> lib/config.h
- cd $(DIR_APP) && make -j $(PARALLELISM)
+ # Fix optimization removal in -Os case for the tests, this fix tests
173 and 301 for us.
+ # Optimization removal is destined to silent some gcc warnings that
those optimization trigger
+ cd $(DIR_APP) && sed -i -e '/O0.*FLAGS/s/0\-9/s0-9/' tests/atlocal.in
+ cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
--enable-gcc-warnings
+ # Unlike LFS, we don't force YYENABLE_NLS as we use --disable-nls
+ #cd $(DIR_APP) && echo '#define YYENABLE_NLS 1' >> lib/config.h
+ cd $(DIR_APP) && make -j $(PARALLELISM) V=1
+
ifeq "$(RUNNING_TEST)" "yes"
- # no test should fail (283 ok, 17 skipped)
- cd $(DIR_APP) && make check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # 285 ok, 18 skipped
+ -cd $(DIR_APP) && make -s -k check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
