Mercurial > mxe-octave

changeset 2175:2bbf834b331d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package gsoap: workaround for parallel building
author Mark Brand <mabrand@mabrand.nl>
date Wed, 14 Dec 2011 10:17:26 +0100
parents 9549d61af2ae
children 4e68de2de908
files src/gsoap.mk
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/gsoap.mk	Wed Dec 14 09:52:57 2011 +0100
+++ b/src/gsoap.mk	Wed Dec 14 10:17:26 2011 +0100
@@ -22,8 +22,9 @@
     # Native build to get tools wsdl2h and soapcpp2
     cd '$(1)' && ./configure
 
-    # Parallel bulds can fail
-    $(MAKE) -C '$(1)'/gsoap -j 1
+    # Work around parallel build problem
+    $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h
+    $(MAKE) -C '$(1)'/gsoap -j '$(JOBS)'
 
     # Install the native tools manually
     $(INSTALL) -m755 '$(1)'/gsoap/wsdl/wsdl2h  '$(PREFIX)/bin/$(TARGET)-wsdl2h'
@@ -47,10 +48,11 @@
     # Building for mingw requires native soapcpp2
     ln -sf '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2'
 
-    # Parallel bulds can fail
-    $(MAKE) -C '$(1)' -j 1 AR='$(TARGET)-ar'
+    # Work around parallel build problem
+    $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h AR='$(TARGET)-ar'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' AR='$(TARGET)-ar'
 
-    $(MAKE) -C '$(1)' -j 1 install
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
     # Apparently there is a tradition of compiling gsoap source files into applications.
     # Since we linked dom.cpp and dom.c into the libraries, this should not be necessary.
     # But we bend to tradition and install these sources into mingw-cross-env.