Revision: 6000
http://ipcop.svn.sourceforge.net/ipcop/?rev=6000&view=rev
Author: gespinasse
Date: 2011-10-26 22:58:14 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
Fix build failure with ./make.sh build test using LFS DOCBOOKTOMAN trick
Send configure log && make check log to test log using the ( ) before redirect
Make the test log more VERBOSE, easier to read than a dot count
Modified Paths:
--------------
ipcop/trunk/lfs/module-init-tools
Modified: ipcop/trunk/lfs/module-init-tools
===================================================================
--- ipcop/trunk/lfs/module-init-tools 2011-10-26 21:24:25 UTC (rev 5999)
+++ ipcop/trunk/lfs/module-init-tools 2011-10-26 22:58:14 UTC (rev 6000)
@@ -87,24 +87,24 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ifeq "$(RUNNING_TEST)" "yes"
- # for testing, a special version is compiled, not suitable for normal
usage
- cd $(DIR_APP) && ./configure
- cd $(DIR_APP) && make check
- # that version use originally both --enable-zlib and --disable-zlib
- # prefer to use our shared libz.so for testing
- cd $(DIR_APP) && sed -i 's|--enable-zlib |--enable-zlib-dynamic |'
tests/runtests
+ # A special build is compiled for testing, not suitable for normal
usage and cleaned at end
+ # Build use originally both --enable-zlib and --disable-zlib
+ # Prefer to use our shared libz.so for testing and workaround a
docbook2man issue
+ cd $(DIR_APP) && sed -i -e 's|--enable-zlib |--enable-zlib-dynamic |' \
+ -e 's@../../configure@DOCBOOKTOMAN=/bin/true
&@' tests/runtests
# no test should fail
- cd $(DIR_APP) && ./tests/runtests &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ cd $(DIR_APP) && export DOCBOOKTOMAN=/bin/true VERBOSE=1; \
+ ( ./configure && \
+ make check && \
+ ./tests/runtests ) &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
cd $(DIR_APP) && make clean
endif
- cd $(DIR_APP) && ./configure --prefix=/usr \
+ cd $(DIR_APP) && DOCBOOKTOMAN=/bin/true ./configure --prefix=/usr \
--exec-prefix=/ \
--enable-zlib-dynamic \
--disable-static-utils
- # fix problems generating man pages by making them appear already built
- @cd $(DIR_APP) && for i in depmod.conf modprobe.conf modules.dep; do
touch build/$$i.5; done
- @cd $(DIR_APP) && for i in depmod insmod lsmod rmmod modprobe modinfo;
do touch $$i.8; done
+
cd $(DIR_APP) && make
cd $(DIR_APP) && make INSTALL=install install
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
