projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7e87cad)
Parallelize emake in src_compile and src_install.
authorKeri Harris <keri@gentoo.org>
Sun, 24 Feb 2008 01:37:27 +0000 (01:37 +0000)
committerKeri Harris <keri@gentoo.org>
Sun, 24 Feb 2008 01:37:27 +0000 (01:37 +0000)
Package-Manager: portage-2.1.4.4

dev-lang/mozart/ChangeLog patch | blob | history
dev-lang/mozart/Manifest patch | blob | history
dev-lang/mozart/files/mozart-1.3.2-portage.patch patch | blob | history
dev-lang/mozart/mozart-1.3.2-r1.ebuild patch | blob | history

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index e374281016b34ded7b9c0f50c0eb9074cbc57c6d..95dad57b3533993fe9e3c835d11edad14fa2531c 100644 (file)
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mozart
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.15 2008/02/23 06:52:54 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.16 2008/02/24 01:37:26 keri Exp $
+
+  24 Feb 2008; keri <keri@gentoo.org> files/mozart-1.3.2-portage.patch,
+  mozart-1.3.2-r1.ebuild:
+  Parallelize emake in src_compile and src_install.
 
   23 Feb 2008; keri <keri@gentoo.org> mozart-1.3.2.ebuild,
   mozart-1.3.2-r1.ebuild:
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index 2c9cbc997401107058953b334e4d055b2ecf3bb8..a4fdb042a0084a9bdf0a2e527c069d28323d2ac0 100644 (file)
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -4,11 +4,11 @@ AUX mozart-1.3.2-emubin.patch 1471 RMD160 2eddbeaf552856097ced86da21a28d849a74ef
 AUX mozart-1.3.2-gcc4.patch 1908 RMD160 e574c6f4b8fd7e3a2c6ff8d0ce62126807c02362 SHA1 21db591df0d2e89d96fa5aef8b424798eedfb0d6 SHA256 a921ff6ded2bf70b255bcd7c57683dc9b6018656147c2202a2748eeb5bb776db
 AUX mozart-1.3.2-nostrip.patch 329 RMD160 9d7e8059e0fc0baf556d7508cc266c6ead0b9a58 SHA1 9f6beaa7fd67a4b8edf9ba9812baa4d8e1d05237 SHA256 e4c503de5da5e9beadcfa6d058a6777924cb18bc26aa458de478c75806e75f95
 AUX mozart-1.3.2-ozplatform.patch 1446 RMD160 c6ad2a34716885280e3df45ebb0018f686b2b33d SHA1 659dd0894f80d8d3ce748a153fac97814ad1ebb8 SHA256 b993248d1f0fc556effb71ddc6d2333bd335a848f0f824f2a45425b1fee7272f
-AUX mozart-1.3.2-portage.patch 9327 RMD160 767b30daefb5915fed5d3d8c85f67340115782f9 SHA1 a233888fb92763a44c540f9a28fd0f84a63b9b18 SHA256 16b3be1fd3c49dd799bee440c54e1373a5ae1e5360b7d073e349d9375abd9fdb
+AUX mozart-1.3.2-portage.patch 11162 RMD160 0b303cf5c538b01f3dc89e1e05a21d29f1a75600 SHA1 4614d30d06392edddbf4ba2c356d51e22eb7eb2d SHA256 3da3c336e4aa62c7a261f39fb53010c55b0293621f83ae96c497ba3886b918b0
 AUX mozart-1.3.2-ri-fpe.patch 1158 RMD160 d8741090acc8fe4bf67c55f873ad141bda01796b SHA1 6ccc5ea52f8cabde2d92a9e01977c37d1d6dd8a0 SHA256 544b2bdc701a80f69541417aeb05885155edc7111f2fd17581c1a0801eaee211
 DIST mozart-1.3.2.20060615-doc.tar.gz 3890265 RMD160 450721bb64cbcc5cefddbaf9c3b0cdfe6261ae5f SHA1 28dfd9f92ba6ee698acb7363146b4a1c0ab4199f SHA256 b169418dd02fb6024d897778908928a6aa800e8ea96b6c76515b064bfac3b84e
 DIST mozart-1.3.2.20060615-src.tar.gz 10798680 RMD160 22dd1f639b6ea525744564b37be009bd599d60ad SHA1 aa980f4de7dcb2b4c2db511a464a5b6497b98109 SHA256 a09acd3365911348fd7b351d73ae1b2ad76ae96ffd335ee08746f5dcca3a55bf
-EBUILD mozart-1.3.2-r1.ebuild 3301 RMD160 bb112eb613d0f7727ccd03d00b8aabe3c1e8286d SHA1 8d253acaa66466c1b85755da10784a8fd434f76d SHA256 e0228640c0c3a4e4bf5fd63c5df4555ddb0e7a4c36496d56a26f6280624a3643
+EBUILD mozart-1.3.2-r1.ebuild 3293 RMD160 a6bd3e60555f689ec03d997e56b3409400401123 SHA1 1e4ba865ad2f51043c3c456f6c8855affd1e848f SHA256 1daac0382dc899d991b247c4d735694d7b849fa0ab00f36ace872a94c6e75f93
 EBUILD mozart-1.3.2.ebuild 2785 RMD160 8380749d2aa3e0a94d644ad2d7f30f96e90c5e3c SHA1 77dc8c83b4fa6482e0902b81bf3c946eb1d82cf5 SHA256 aa25a19476a98bf3959c672a19a311abc1627ed2d4f682f0e7b1eaf6aab139bb
-MISC ChangeLog 2301 RMD160 baf34a4fca0eb492a9e883a0e2580cbe8e22fbf4 SHA1 ee014de56f33539d5abf51b6e964a94322936a1a SHA256 3ca3bca9fd66d8d067b8cb205aec1c2622c8f9035e60229e1b4e03564cf7ce74
+MISC ChangeLog 2452 RMD160 e934d086672efb3691515dce45d45d4f8a4050e4 SHA1 4eb4080ca9a08b5077b4c61c904a7affcc00189b SHA256 d95d0a4a86d64e3cb28cd15eed79863d5fbf90c04d002961ab2c6aaec28a5025
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mozart/files/mozart-1.3.2-portage.patch b/dev-lang/mozart/files/mozart-1.3.2-portage.patch
index 3b8da2968ab6c33d51e0b1cf9d194475511b0ea4..0743307ce709eced8928a13557aa5fb80f6a17bd 100644 (file)
--- a/dev-lang/mozart/files/mozart-1.3.2-portage.patch
+++ b/dev-lang/mozart/files/mozart-1.3.2-portage.patch
@@ -13,6 +13,23 @@ diff -ur mozart-1.3.2.20060615.orig/Makefile.in mozart-1.3.2.20060615/Makefile.i
 diff -ur mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in mozart-1.3.2.20060615/platform/emulator/Makefile.in
 --- mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in   2004-01-12 23:03:44.000000000 +1300
 +++ mozart-1.3.2.20060615/platform/emulator/Makefile.in        2007-02-18 09:31:31.000000000 +1300
+@@ -226,10 +226,15 @@
+ .PHONY:       all first install install-bin install-inc \
+       install-dir depend tags clean cleaner distclean veryclean
+ 
+-all: $(TARGETS) $(DYNAMIC_MODULETARGETS)
++all: $(TARGETS) dynamic_modules
+ 
+ bootstrap:: all
+ 
++dynamic_modules: $(TARGETS)
++      for dynamic_module in $(DYNAMIC_MODULETARGETS); do \
++        $(MAKE) $$dynamic_module; \
++      done
++
+ $(MODINTERS): bidecl.perl
+ 
+ .PHONY: libDPB.a DPB.so-$(PLATFORM)
 @@ -400,7 +400,7 @@
  $(NEWCACHEDIR):
        $(INSTALL_DIR) $@
@@ -22,6 +39,27 @@ diff -ur mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in mozart-1.3.2.2
        $(INSTALL_FILE) $< $@
  
  install-inc: $(INCDIR)
+diff -ur mozart-1.3.2.20060615.orig/platform/emulator/libdp/Makefile.in mozart-1.3.2.20060615/platform/emulator/libdp/Makefile.in
+--- mozart-1.3.2.20060615.orig/platform/emulator/libdp/Makefile.in     2002-08-03 08:20:44.000000000 +1200
++++ mozart-1.3.2.20060615/platform/emulator/libdp/Makefile.in  2008-02-23 14:53:00.000000000 +1300
+@@ -88,7 +88,7 @@
+       $(AR) -rc $@ $< && $(RANLIB) $@
+ 
+ #
+-dpMiscModule.lo: ../modDPMisc-if.cc
++dpMiscModule.lo: ../modDPMisc-if.cc $(CREATEDFILES)
+ 
+ ../DPMisc.so-$(PLATFORM): dpMiscModule.lo 
+       $(DYNLD) -o $@ $<
+@@ -146,6 +146,8 @@
+ msgContainer_marshal.cc: msgContainer_marshal.m4cc msgFormat.m4
+ msgContainer.o: msgContainer_marshal.m4cc msgFormat.m4
+ 
++$(REALCORESRCS): $(CREATEDCOREFILES)
++
+ BUILDDIR=$(shell pwd)
+ tags: $(CREATEDFILES)
+       etags \
 diff -ur mozart-1.3.2.20060615.orig/platform/tools/gump/Makefile.in mozart-1.3.2.20060615/platform/tools/gump/Makefile.in
 --- mozart-1.3.2.20060615.orig/platform/tools/gump/Makefile.in 2003-01-08 02:40:10.000000000 +1300
 +++ mozart-1.3.2.20060615/platform/tools/gump/Makefile.in      2007-02-18 09:31:31.000000000 +1300
@@ -68,11 +106,18 @@ diff -ur mozart-1.3.2.20060615.orig/share/bin/Makefile.in mozart-1.3.2.20060615/
 diff -ur mozart-1.3.2.20060615.orig/share/demo/Makefile.in mozart-1.3.2.20060615/share/demo/Makefile.in
 --- mozart-1.3.2.20060615.orig/share/demo/Makefile.in  2001-10-16 23:10:03.000000000 +1300
 +++ mozart-1.3.2.20060615/share/demo/Makefile.in       2007-02-18 09:31:31.000000000 +1300
-@@ -86,13 +86,13 @@
- $(OZDEMO) $(SYSTEMDOC) $(SYSTEMOZF):
+@@ -83,16 +83,19 @@
+ install:: $(OZDEMO) $(DEMOAPPLETS) \
+       $(SYSTEMDOC) $(SYSTEMOZF) $(SYSTEMOZF)/MT10.ozf $(SYSTEMDOC)/MT10.oz
+ 
+-$(OZDEMO) $(SYSTEMDOC) $(SYSTEMOZF):
++$(OZDEMO) $(SYSTEMOZF):
        $(INSTALL_DIR) $@
  
 -$(OZDEMO)/%.oza: %.oza
++$(SYSTEMDOC): $(OZDEMO)
++      $(INSTALL_DIR) $@
++
 +$(OZDEMO)/%.oza: %.oza $(OZDEMO)
        $(INSTALL_FILE) $< $@
  
@@ -85,9 +130,14 @@ diff -ur mozart-1.3.2.20060615.orig/share/demo/Makefile.in mozart-1.3.2.20060615
        $(INSTALL_FILE) $< $@
  
  #
-@@ -281,17 +281,17 @@
+@@ -279,19 +282,21 @@
+ 
+ install:: $(OZIMGDIRS) $(OZIMAGES)
  
- $(OZIMGDIRS):
+-$(OZIMGDIRS):
++$(OZIMG): $(SYSTEMOZF)
++      $(INSTALL_DIR) $@
++$(OZIMGDIRS): $(OZIMG)
        $(INSTALL_DIR) $@
 -$(OZIMG)/animated-queens/%.xbm: images/animated-queens/%.xbm
 +$(OZIMG)/animated-queens/%.xbm: images/animated-queens/%.xbm $(OZIMGDIRS)
@@ -128,7 +178,28 @@ diff -ur mozart-1.3.2.20060615.orig/share/elisp/Makefile.in mozart-1.3.2.2006061
 diff -ur mozart-1.3.2.20060615.orig/share/examples/Makefile.in mozart-1.3.2.20060615/share/examples/Makefile.in
 --- mozart-1.3.2.20060615.orig/share/examples/Makefile.in      2003-04-23 21:49:55.000000000 +1200
 +++ mozart-1.3.2.20060615/share/examples/Makefile.in   2007-02-18 09:31:31.000000000 +1300
-@@ -96,19 +96,19 @@
+@@ -63,15 +63,17 @@
+       $(FUNCTORS:%=$(OZEX)/fd/graphics/%)
+ 
+ EXDIRS = \
+-      sampler sampler/constraints \
+-      fd grammar grammar/shieber \
++      sampler/constraints \
++      grammar/shieber \
+       fd/graphics
+ 
+ 
+ OZEXDIRS = $(EXDIRS:%=$(OZEX)/%)
+ 
+ 
+-$(OZEX) $(OZEXDIRS):
++$(OZEX):
++      $(INSTALL_DIR) $@
++$(OZEXDIRS): $(OZEX)
+       $(INSTALL_DIR) $@
+ 
+ FD = \
+@@ -96,19 +98,19 @@
        constraints/scheduling-compiler constraints oz
  SAMPLER = $(SAMPLER0:%=$(OZEX)/sampler/%.oz)
  
diff --git a/dev-lang/mozart/mozart-1.3.2-r1.ebuild b/dev-lang/mozart/mozart-1.3.2-r1.ebuild
index 27e791f2dba81bac3370b58fafd4a0acda6e92e4..aa013d3e4632a028a0cc6fd184fea0a4b407b4e4 100644 (file)
--- a/dev-lang/mozart/mozart-1.3.2-r1.ebuild
+++ b/dev-lang/mozart/mozart-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2-r1.ebuild,v 1.2 2008/02/23 06:52:54 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2-r1.ebuild,v 1.3 2008/02/24 01:37:26 keri Exp $
 
 inherit elisp-common eutils
 
@@ -78,7 +78,7 @@ src_compile() {
                $(use_enable threads threaded) \
                || die "econf failed"
 
-       emake -j1 bootstrap || die "emake bootstrap failed"
+       emake bootstrap || die "emake bootstrap failed"
 }
 
 src_test() {
@@ -88,7 +88,7 @@ src_test() {
 }
 
 src_install() {
-       emake -j1 \
+       emake \
                PREFIX="${D}"/usr/lib/mozart \
                ELISPDIR="${D}${SITELISP}/${PN}" \
                install || die "emake install failed"
Unnamed repository; edit this file 'description' to name the repository.