Revision: 6769
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6769&view=rev
Author:   gespinasse
Date:     2012-08-19 09:11:03 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Fix tests after binutils-2.22 upgrade.
This does mostly the same resulting change as upstream but a patch on 
Makefile.am would not work due to automake-1.11 not found (1.12 is installed)

Remove .bak on previous sed, only help during testing

Add -k to make check, so tests continue even after a failure
Let the tests not break the build. This only loose time when only the issue is 
only in test suite.

Modified Paths:
--------------
    ipcop/trunk/lfs/pango

Modified: ipcop/trunk/lfs/pango
===================================================================
--- ipcop/trunk/lfs/pango       2012-08-17 15:44:46 UTC (rev 6768)
+++ ipcop/trunk/lfs/pango       2012-08-19 09:11:03 UTC (rev 6769)
@@ -89,10 +89,13 @@
 
        # Workaround for half of strict-aliasing warnings
        # No inspiration yet for the remaining except adding for the entire 
package?
-       cd $(DIR_APP) && sed -i.bak 's/PangoFT2_1_0_gir_CFLAGS.*/& 
-fno-strict-aliasing/' pango/Makefile
+       cd $(DIR_APP) && sed -i 's/PangoFT2_1_0_gir_CFLAGS.*/& 
-fno-strict-aliasing/' pango/Makefile
+       # Fix GLIB_LIBS missing in tests after binutils-2.22 upgrade
+       # Inspired by upstream change but a patch on Makefile.am would be a 
nightmare due to automake-1.11 missing issue
+       cd $(DIR_APP) && sed -i '/test.*\.\.\/pango/s/LDADD = /LDADD = 
$$(GLIB_LIBS) /' tests/Makefile
        cd $(DIR_APP) && make -j $(PARALLELISM) V=1
 ifeq "$(RUNNING_TEST)" "yes"
-       cd $(DIR_APP) && make -j 1 check &> 
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+       -cd $(DIR_APP) && make -j 1 -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

Reply via email to