Gentoo Archives: gentoo-commits

From: "Keri Harris (keri)" <keri@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/mozart/files: mozart-1.3.2-portage.patch
Date: Sun, 24 Feb 2008 01:37:33
Message-Id: E1JT5nz-0003Lx-T3@stork.gentoo.org
1 keri 08/02/24 01:37:27
2
3 Modified: mozart-1.3.2-portage.patch
4 Log:
5 Parallelize emake in src_compile and src_install.
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.3 dev-lang/mozart/files/mozart-1.3.2-portage.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/files/mozart-1.3.2-portage.patch?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/files/mozart-1.3.2-portage.patch?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/files/mozart-1.3.2-portage.patch?r1=1.2&r2=1.3
14
15 Index: mozart-1.3.2-portage.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-lang/mozart/files/mozart-1.3.2-portage.patch,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- mozart-1.3.2-portage.patch 17 Feb 2007 20:48:41 -0000 1.2
22 +++ mozart-1.3.2-portage.patch 24 Feb 2008 01:37:27 -0000 1.3
23 @@ -13,6 +13,23 @@
24 diff -ur mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in mozart-1.3.2.20060615/platform/emulator/Makefile.in
25 --- mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in 2004-01-12 23:03:44.000000000 +1300
26 +++ mozart-1.3.2.20060615/platform/emulator/Makefile.in 2007-02-18 09:31:31.000000000 +1300
27 +@@ -226,10 +226,15 @@
28 + .PHONY: all first install install-bin install-inc \
29 + install-dir depend tags clean cleaner distclean veryclean
30 +
31 +-all: $(TARGETS) $(DYNAMIC_MODULETARGETS)
32 ++all: $(TARGETS) dynamic_modules
33 +
34 + bootstrap:: all
35 +
36 ++dynamic_modules: $(TARGETS)
37 ++ for dynamic_module in $(DYNAMIC_MODULETARGETS); do \
38 ++ $(MAKE) $$dynamic_module; \
39 ++ done
40 ++
41 + $(MODINTERS): bidecl.perl
42 +
43 + .PHONY: libDPB.a DPB.so-$(PLATFORM)
44 @@ -400,7 +400,7 @@
45 $(NEWCACHEDIR):
46 $(INSTALL_DIR) $@
47 @@ -22,6 +39,27 @@
48 $(INSTALL_FILE) $< $@
49
50 install-inc: $(INCDIR)
51 +diff -ur mozart-1.3.2.20060615.orig/platform/emulator/libdp/Makefile.in mozart-1.3.2.20060615/platform/emulator/libdp/Makefile.in
52 +--- mozart-1.3.2.20060615.orig/platform/emulator/libdp/Makefile.in 2002-08-03 08:20:44.000000000 +1200
53 ++++ mozart-1.3.2.20060615/platform/emulator/libdp/Makefile.in 2008-02-23 14:53:00.000000000 +1300
54 +@@ -88,7 +88,7 @@
55 + $(AR) -rc $@ $< && $(RANLIB) $@
56 +
57 + #
58 +-dpMiscModule.lo: ../modDPMisc-if.cc
59 ++dpMiscModule.lo: ../modDPMisc-if.cc $(CREATEDFILES)
60 +
61 + ../DPMisc.so-$(PLATFORM): dpMiscModule.lo
62 + $(DYNLD) -o $@ $<
63 +@@ -146,6 +146,8 @@
64 + msgContainer_marshal.cc: msgContainer_marshal.m4cc msgFormat.m4
65 + msgContainer.o: msgContainer_marshal.m4cc msgFormat.m4
66 +
67 ++$(REALCORESRCS): $(CREATEDCOREFILES)
68 ++
69 + BUILDDIR=$(shell pwd)
70 + tags: $(CREATEDFILES)
71 + etags \
72 diff -ur mozart-1.3.2.20060615.orig/platform/tools/gump/Makefile.in mozart-1.3.2.20060615/platform/tools/gump/Makefile.in
73 --- mozart-1.3.2.20060615.orig/platform/tools/gump/Makefile.in 2003-01-08 02:40:10.000000000 +1300
74 +++ mozart-1.3.2.20060615/platform/tools/gump/Makefile.in 2007-02-18 09:31:31.000000000 +1300
75 @@ -68,11 +106,18 @@
76 diff -ur mozart-1.3.2.20060615.orig/share/demo/Makefile.in mozart-1.3.2.20060615/share/demo/Makefile.in
77 --- mozart-1.3.2.20060615.orig/share/demo/Makefile.in 2001-10-16 23:10:03.000000000 +1300
78 +++ mozart-1.3.2.20060615/share/demo/Makefile.in 2007-02-18 09:31:31.000000000 +1300
79 -@@ -86,13 +86,13 @@
80 - $(OZDEMO) $(SYSTEMDOC) $(SYSTEMOZF):
81 +@@ -83,16 +83,19 @@
82 + install:: $(OZDEMO) $(DEMOAPPLETS) \
83 + $(SYSTEMDOC) $(SYSTEMOZF) $(SYSTEMOZF)/MT10.ozf $(SYSTEMDOC)/MT10.oz
84 +
85 +-$(OZDEMO) $(SYSTEMDOC) $(SYSTEMOZF):
86 ++$(OZDEMO) $(SYSTEMOZF):
87 $(INSTALL_DIR) $@
88
89 -$(OZDEMO)/%.oza: %.oza
90 ++$(SYSTEMDOC): $(OZDEMO)
91 ++ $(INSTALL_DIR) $@
92 ++
93 +$(OZDEMO)/%.oza: %.oza $(OZDEMO)
94 $(INSTALL_FILE) $< $@
95
96 @@ -85,9 +130,14 @@
97 $(INSTALL_FILE) $< $@
98
99 #
100 -@@ -281,17 +281,17 @@
101 +@@ -279,19 +282,21 @@
102 +
103 + install:: $(OZIMGDIRS) $(OZIMAGES)
104
105 - $(OZIMGDIRS):
106 +-$(OZIMGDIRS):
107 ++$(OZIMG): $(SYSTEMOZF)
108 ++ $(INSTALL_DIR) $@
109 ++$(OZIMGDIRS): $(OZIMG)
110 $(INSTALL_DIR) $@
111 -$(OZIMG)/animated-queens/%.xbm: images/animated-queens/%.xbm
112 +$(OZIMG)/animated-queens/%.xbm: images/animated-queens/%.xbm $(OZIMGDIRS)
113 @@ -128,7 +178,28 @@
114 diff -ur mozart-1.3.2.20060615.orig/share/examples/Makefile.in mozart-1.3.2.20060615/share/examples/Makefile.in
115 --- mozart-1.3.2.20060615.orig/share/examples/Makefile.in 2003-04-23 21:49:55.000000000 +1200
116 +++ mozart-1.3.2.20060615/share/examples/Makefile.in 2007-02-18 09:31:31.000000000 +1300
117 -@@ -96,19 +96,19 @@
118 +@@ -63,15 +63,17 @@
119 + $(FUNCTORS:%=$(OZEX)/fd/graphics/%)
120 +
121 + EXDIRS = \
122 +- sampler sampler/constraints \
123 +- fd grammar grammar/shieber \
124 ++ sampler/constraints \
125 ++ grammar/shieber \
126 + fd/graphics
127 +
128 +
129 + OZEXDIRS = $(EXDIRS:%=$(OZEX)/%)
130 +
131 +
132 +-$(OZEX) $(OZEXDIRS):
133 ++$(OZEX):
134 ++ $(INSTALL_DIR) $@
135 ++$(OZEXDIRS): $(OZEX)
136 + $(INSTALL_DIR) $@
137 +
138 + FD = \
139 +@@ -96,19 +98,19 @@
140 constraints/scheduling-compiler constraints oz
141 SAMPLER = $(SAMPLER0:%=$(OZEX)/sampler/%.oz)
142
143
144
145
146 --
147 gentoo-commits@l.g.o mailing list