Parallelize compile of Prolog engine.

Package-Manager: portage-2.1.2-r6

diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog
index 20acd915e28111ad6c16c90b5e8873e2d4698e21..f9c3f54c19ba438e39c707b73157f858bec5683d 100644 (file)
--- a/dev-lang/xsb/ChangeLog
+++ b/dev-lang/xsb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/xsb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.4 2007/01/29 17:46:06 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.5 2007/02/02 21:27:25 keri Exp $
+
+  02 Feb 2007; keri <keri@gentoo.org> files/xsb-3.0.1-portage.patch:
+  Parallelize compile of Prolog engine.
 
   29 Jan 2007; keri <keri@gentoo.org> xsb-3.0.1.ebuild:
   Enable interprolog with Java.

diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index 3203012b9a54db083107bf5934d3874201d076f1..95ea56706cded7ca1cadb893a093239321cde445 100644 (file)
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -38,10 +38,10 @@ AUX xsb-3.0.1-perlmatch.patch 700 RMD160 4c8e37035a39f487c08fecc9577060b4481461d
 MD5 89ecfe175ef80394b10ef41d5380c2c9 files/xsb-3.0.1-perlmatch.patch 700
 RMD160 4c8e37035a39f487c08fecc9577060b4481461df files/xsb-3.0.1-perlmatch.patch 700
 SHA256 c0a33087fa8ae9c7e1c97466f7469bd104cfa933f1484868aceab7a06b99c362 files/xsb-3.0.1-perlmatch.patch 700
-AUX xsb-3.0.1-portage.patch 3617 RMD160 0ae54041ed1c552f61cd72ec9e99364a45dba37f SHA1 13aca2e35c27d57d117592f970c84f872aebd11f SHA256 1038ea6a3d843d45a7710b5a64b374a1c065383dc032224695c06baf39a7d15c
-MD5 af6575cc6e40df49f7a0bb124ea4f0cf files/xsb-3.0.1-portage.patch 3617
-RMD160 0ae54041ed1c552f61cd72ec9e99364a45dba37f files/xsb-3.0.1-portage.patch 3617
-SHA256 1038ea6a3d843d45a7710b5a64b374a1c065383dc032224695c06baf39a7d15c files/xsb-3.0.1-portage.patch 3617
+AUX xsb-3.0.1-portage.patch 5012 RMD160 c26f95da2ee14edbe60b465110ac88963569b99d SHA1 19787059b0d7864d5c5b294310e357f821257340 SHA256 c1a98be66df8502462af86d2699d0ca24a91f555490df108d8cb500868dd1372
+MD5 06881ccff1616076ef1858a893b5b186 files/xsb-3.0.1-portage.patch 5012
+RMD160 c26f95da2ee14edbe60b465110ac88963569b99d files/xsb-3.0.1-portage.patch 5012
+SHA256 c1a98be66df8502462af86d2699d0ca24a91f555490df108d8cb500868dd1372 files/xsb-3.0.1-portage.patch 5012
 AUX xsb-3.0.1-sgml.patch 8436 RMD160 af1b90979e34f249841555e766c507bba60144b6 SHA1 54bd92d87f5953dd7384958f8be50f428046e5fc SHA256 ee6f7b029695ac326c7de0f138d191a9f471f576a88eb485b1accee84b644f44
 MD5 f278fdf6333f91f215638d6950ac08e3 files/xsb-3.0.1-sgml.patch 8436
 RMD160 af1b90979e34f249841555e766c507bba60144b6 files/xsb-3.0.1-sgml.patch 8436
@@ -67,10 +67,10 @@ EBUILD xsb-3.0.1.ebuild 4428 RMD160 768dc8f2409bda68624bed4c579476e4242221bc SHA
 MD5 7bcbc300594e2a181961da1d3dd7b80c xsb-3.0.1.ebuild 4428
 RMD160 768dc8f2409bda68624bed4c579476e4242221bc xsb-3.0.1.ebuild 4428
 SHA256 fbefdd593ed5507ae1301e19b4f54ab32a9b2df4861339b8e6e3b78656d8ea6c xsb-3.0.1.ebuild 4428
-MISC ChangeLog 1244 RMD160 04eb2e23671ec81fc6a99e2aab55b157dbf9c306 SHA1 0d6e83f6798dadff6daed5540b98f69b53e574a8 SHA256 b96c16a25539f81873df55403325e3b02fb228b5897e0c48fde9a2807ac1e4f8
-MD5 be49bde8f849d5db7cc58d2b994cf7a8 ChangeLog 1244
-RMD160 04eb2e23671ec81fc6a99e2aab55b157dbf9c306 ChangeLog 1244
-SHA256 b96c16a25539f81873df55403325e3b02fb228b5897e0c48fde9a2807ac1e4f8 ChangeLog 1244
+MISC ChangeLog 1354 RMD160 e0b7a2dd4d9ce605b1d18bef5fa3eff04096e605 SHA1 5aea2a85f9bf9576d9c5ae419caaf403d5092671 SHA256 56746c545e4766723779df0f62c93678814e9207b567d8063572d28c42ef81a3
+MD5 4515869a738e82cddf771aefdefdba02 ChangeLog 1354
+RMD160 e0b7a2dd4d9ce605b1d18bef5fa3eff04096e605 ChangeLog 1354
+SHA256 56746c545e4766723779df0f62c93678814e9207b567d8063572d28c42ef81a3 ChangeLog 1354
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159

diff --git a/dev-lang/xsb/files/xsb-3.0.1-portage.patch b/dev-lang/xsb/files/xsb-3.0.1-portage.patch
index 1404def1e396d7de29871cae75d31b38ce6d73f9..69704d1101a315e65521877420176cc5d06ea916 100644 (file)
--- a/dev-lang/xsb/files/xsb-3.0.1-portage.patch
+++ b/dev-lang/xsb/files/xsb-3.0.1-portage.patch
@@ -1,5 +1,5 @@
 --- XSB.orig/build/topMakefile.in      2006-06-25 13:09:42.000000000 +1200
-+++ XSB/build/topMakefile.in   2007-01-28 12:01:01.000000000 +1300
++++ XSB/build/topMakefile.in   2007-02-03 10:14:38.000000000 +1300
 @@ -72,7 +72,7 @@
  # Everything is placed in subdirectories of this directory.
  # The values for many of the variables below are expressed
@@ -23,11 +23,11 @@
  
  # Normal user
 -all: prepare emu xsbmod xsbdll gpp remake_dot_O_files register emu_clean
-+all: prepare emu xsbmod xsbdll gpp remake_dot_O_files emu_clean
++all: prepare emu xsbmod gpp remake_dot_O_files
  
  # Developer who just checked out or updated CVS copy
  devel: prepare emu xsbmod xsbdll gpp remake_dot_O_files emu_clean
-@@ -178,18 +178,11 @@
+@@ -178,28 +178,21 @@
        @cat $(srcdir)/build/.*.tmp 2> /dev/null | \
                        tee -a Installation_summary
  prepare:
@@ -39,15 +39,41 @@
 -        rm -f *.o Makefile ; \
 -        ln -s ${src_config_prefix}/gppMakefile ./Makefile
 -      @rm -f $(srcdir)/build/.*.tmp
-+      @mkdir $(src_bindir)
-+      @mkdir $(src_config_objlibdir)
++      @(test -d $(src_bindir) || mkdir $(src_bindir))
++      @(test -d $(src_config_objlibdir) || mkdir $(src_config_objlibdir))
  
- emu: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h
+-emu: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h
++emu: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h prepare
        @cd ${src_emudir}; \
 -              make depend; \
                rm -f $(srcdir)/build/.xsb_build_failed; \
-               (make EXECUTABLE="$(EXECUTABLE)" $(emumake_goal) || \
+-              (make EXECUTABLE="$(EXECUTABLE)" $(emumake_goal) || \
++              ($(MAKE) EXECUTABLE="$(EXECUTABLE)" $(emumake_goal) || \
                        $(srcdir)/build/touch.sh $(srcdir)/build/.xsb_build_failed) \
+               2>&1 | tee -a ../build/Installation_summary; \
+               (test ! -f $(srcdir)/build/.xsb_build_failed || \
+                                       (rm -f $(srcdir)/build/.xsb_build_failed; exit 1))
+ 
+-gpp:
++gpp: xsbmod
+       @echo ""; echo "Making gpp"
+-      @cd $(srcdir)/gpp; make 2>&1 | tee -a ../build/Installation_summary
++      @cd $(srcdir)/gpp; $(MAKE) 2>&1 | tee -a ../build/Installation_summary
+ 
+ # Compiling the interface with SMODELS.
+ xasp:
+@@ -220,9 +213,9 @@
+ 
+ # if supporting Oracle, then emumake_goal=xsbora; else emumake_goal=xsb
+ # This invokes xsboramod and xsbmod goals in emuMakefile, respectively
+-xsbmod: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h
++xsbmod: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h emu
+       @cd ${src_emudir}; \
+-              make $(emumake_goal)mod
++              $(MAKE) $(emumake_goal)mod
+ 
+ xsbdynmod: ${src_config_prefix}/xsb_config.h ${src_config_prefix}/xsb_debug.h
+       @cd ${src_emudir}; \
 @@ -266,7 +259,7 @@
        @./register.sh
  
@@ -92,3 +118,12 @@
                echo "Copying etc..."; \
                cp -fr ${src_etcdir}/* ${install_etcdir}; \
                echo "Copying examples..."; \
+@@ -416,7 +395,7 @@
+       @./pkg_config.sh $(install_scriptdir)/xsb$(config_tag) ; \
+         chmod 644  $(install_config_libdir)/xsb_configuration$(xsb_obj_extension)
+ 
+-remake_dot_O_files:
++remake_dot_O_files: gpp
+       @cd $(srcdir); make XSB=$(src_scriptdir)/xsb$(config_tag)
+ 
+ remake_dot_O_files_force: