1 |
commit: d624476e7f55ece7dde7127d1dc03ffb8b07eb30 |
2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 14 19:10:55 2011 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 14 19:10:55 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=d624476e |
7 |
|
8 |
Multiple fixed for spidermonkey-1.8.5 |
9 |
|
10 |
--- |
11 |
dev-lang/spidermonkey/Manifest | 7 +- |
12 |
.../spidermonkey-1.8.5-fix-install-symlinks.patch | 15 +++ |
13 |
.../files/spidermonkey-1.8.5-fix-ppc64.patch | 31 +++++++ |
14 |
.../files/spidermonkey-1.9.2.13-as-needed.patch | 22 ----- |
15 |
dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild | 74 --------------- |
16 |
dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild | 94 ++++++++++++++++++++ |
17 |
6 files changed, 144 insertions(+), 99 deletions(-) |
18 |
|
19 |
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest |
20 |
index 8fbf7dc..61a0e22 100644 |
21 |
--- a/dev-lang/spidermonkey/Manifest |
22 |
+++ b/dev-lang/spidermonkey/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
-AUX spidermonkey-1.9.2.13-as-needed.patch 623 RMD160 2f77a10c5984d078ed187b1b5f469393f8c7a35d SHA1 367571f1d440e46f87d3edcfafbff0d17cce3cdb SHA256 5163be062d23265cc19e9b1acb441ec42ceb2fd678b03076880869b7b9f92f8f |
25 |
-DIST firefox-3.6.13.source.tar.bz2 51478675 RMD160 658409db60a8f412ac74ff15a8c1d8c4ed85b71e SHA1 1d1bc70d651bce4006687f5762638563c0494267 SHA256 4b90775c0f29cb7e170a80894311d8c7a2cd794c50e2124b70d1b83011c45f63 |
26 |
-EBUILD spidermonkey-1.8.2.13.ebuild 1603 RMD160 1e1358b96e3a10dd2fd06238726e784d14c7ae44 SHA1 f5564e028be5fa8416fd53a5b1a1ac8861f835f4 SHA256 a90bf84e00990defacf04c00e9cca36da885ce739b2aa3e9a6f44a9fb2adaf7c |
27 |
+AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 RMD160 0a6e799e6b47c0011ba02c877e0d190ae3830c62 SHA1 b0f776c06e956024fb0f0553f8056bbce0830273 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823 |
28 |
+AUX spidermonkey-1.8.5-fix-ppc64.patch 849 RMD160 def597b1b913385b908da7e09683c23bc5e6e61d SHA1 4700b680441e65854e9fb3108218ea9f0f8d264d SHA256 5cfdb6a590e02c83cd15732e417da9fdd26bd65490fe07e21c173d375e3c6abc |
29 |
+DIST js185-1.0.0.tar.gz 6164605 RMD160 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005 SHA1 52a01449c48d7a117b35f213d3e4263578d846d6 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 |
30 |
+EBUILD spidermonkey-1.8.5.ebuild 2308 RMD160 326b2e3097f0db237d28a0a24170f39be39657bf SHA1 f25c6d765a2008bef18eab74398881918a142d1b SHA256 447f4def37621da91082d3cf7ffcca9e6af7095dcadf8aeddd497a02c2a3a760 |
31 |
|
32 |
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch |
33 |
new file mode 100644 |
34 |
index 0000000..c867e45 |
35 |
--- /dev/null |
36 |
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch |
37 |
@@ -0,0 +1,15 @@ |
38 |
+https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43 |
39 |
+ |
40 |
+--- js/src/Makefile.in |
41 |
++++ js/src/Makefile.in |
42 |
+@@ -888,8 +888,8 @@ |
43 |
+ ifeq (,$(HOST_BIN_SUFFIX)) |
44 |
+ mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER) |
45 |
+ @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER) |
46 |
+- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER) |
47 |
+- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER) |
48 |
++ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER) |
49 |
++ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER) |
50 |
+ endif |
51 |
+ endif |
52 |
+ ifneq (,$(IMPORT_LIBRARY)) |
53 |
|
54 |
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch |
55 |
new file mode 100644 |
56 |
index 0000000..d7a2b9e |
57 |
--- /dev/null |
58 |
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch |
59 |
@@ -0,0 +1,31 @@ |
60 |
+# HG changeset patch |
61 |
+# User Mike Hommey <mh+mozilla@××××××××.org> |
62 |
+# Date 1303461188 -7200 |
63 |
+# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1 |
64 |
+# Parent c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec |
65 |
+Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary |
66 |
+ |
67 |
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in |
68 |
+--- a/js/src/Makefile.in |
69 |
++++ b/js/src/Makefile.in |
70 |
+@@ -383,17 +383,17 @@ CPPSRCS += checks.cc \ |
71 |
+ platform.cc \ |
72 |
+ utils.cc \ |
73 |
+ $(NONE) |
74 |
+ |
75 |
+ # |
76 |
+ # END enclude sources for V8 dtoa |
77 |
+ ############################################# |
78 |
+ |
79 |
+-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU))) |
80 |
++ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU))) |
81 |
+ |
82 |
+ VPATH += $(srcdir)/assembler \ |
83 |
+ $(srcdir)/assembler/wtf \ |
84 |
+ $(srcdir)/yarr/pcre \ |
85 |
+ $(NULL) |
86 |
+ |
87 |
+ CPPSRCS += pcre_compile.cpp \ |
88 |
+ pcre_exec.cpp \ |
89 |
+ |
90 |
+ |
91 |
|
92 |
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch |
93 |
deleted file mode 100644 |
94 |
index 847bf79..0000000 |
95 |
--- a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch |
96 |
+++ /dev/null |
97 |
@@ -1,22 +0,0 @@ |
98 |
-diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in |
99 |
---- a/js/src/jsapi-tests/Makefile.in |
100 |
-+++ b/js/src/jsapi-tests/Makefile.in |
101 |
-@@ -55,17 +55,17 @@ CPPSRCS = \ |
102 |
- testSameValue.cpp \ |
103 |
- testDebugger.cpp \ |
104 |
- testDefineGetterSetterNonEnumerable.cpp \ |
105 |
- testExtendedEq.cpp \ |
106 |
- $(NULL) |
107 |
- |
108 |
- DEFINES += -DEXPORT_JS_API |
109 |
- |
110 |
--LIBS = $(NSPR_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) |
111 |
-+LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) |
112 |
- |
113 |
- LOCAL_INCLUDES += -I$(topsrcdir) -I.. |
114 |
- |
115 |
- ifdef _MSC_VER |
116 |
- ifdef WINCE |
117 |
- WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup |
118 |
- endif |
119 |
- endif |
120 |
|
121 |
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild |
122 |
deleted file mode 100644 |
123 |
index b788c5b..0000000 |
124 |
--- a/dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild |
125 |
+++ /dev/null |
126 |
@@ -1,74 +0,0 @@ |
127 |
-# Copyright 1999-2009 Gentoo Foundation |
128 |
-# Distributed under the terms of the GNU General Public License v2 |
129 |
-# $Header: $ |
130 |
- |
131 |
-EAPI="2" |
132 |
-inherit eutils toolchain-funcs multilib python |
133 |
- |
134 |
-MY_PV="${PV}" |
135 |
-MY_PV="${MY_PV/1.8.2/3.6}" |
136 |
-DESCRIPTION="Stand-alone JavaScript C library" |
137 |
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/" |
138 |
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" |
139 |
-SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2" |
140 |
- |
141 |
-LICENSE="NPL-1.1" |
142 |
-SLOT="0" |
143 |
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd" |
144 |
-IUSE="threadsafe" |
145 |
- |
146 |
-S="${WORKDIR}/mozilla-1.9.2" |
147 |
-BUILDDIR="${S}/js/src" |
148 |
- |
149 |
-RDEPEND="threadsafe? ( >=dev-libs/nspr-4.8.6 )" |
150 |
- |
151 |
-DEPEND="${RDEPEND} |
152 |
- app-arch/zip |
153 |
- =dev-lang/python-2*[threads] |
154 |
- dev-util/pkgconfig" |
155 |
- |
156 |
-pkg_setup(){ |
157 |
- python_set_active_version 2 |
158 |
-} |
159 |
- |
160 |
-src_prepare() { |
161 |
- unpack ${A} |
162 |
- |
163 |
- epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch" |
164 |
- |
165 |
- epatch_user |
166 |
- |
167 |
- cd "${S}" |
168 |
- if [[ ${CHOST} == *-freebsd* ]]; then |
169 |
- # Don't try to be smart, this does not work in cross-compile anyway |
170 |
- ln -s "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" |
171 |
- fi |
172 |
-} |
173 |
- |
174 |
-src_configure() { |
175 |
- cd ${BUILDDIR} |
176 |
- |
177 |
- local myconf |
178 |
- |
179 |
- if use threadsafe ; then |
180 |
- myconf="${myconf} --with-system-nspr \ |
181 |
- --enable-threadsafe" |
182 |
- fi |
183 |
- # Disable no-print-directory |
184 |
- MAKEOPTS=${MAKEOPTS/--no-print-directory/} |
185 |
- |
186 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf \ |
187 |
- ${myconf} |
188 |
-} |
189 |
- |
190 |
-src_compile() { |
191 |
- cd ${BUILDDIR} |
192 |
- emake -j1 || die "emake failed"; |
193 |
-} |
194 |
- |
195 |
-src_install() { |
196 |
- cd ${BUILDDIR} |
197 |
- emake install DESTDIR="${D}" || die |
198 |
- dodoc ../jsd/README |
199 |
- dohtml README.html |
200 |
-} |
201 |
|
202 |
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild |
203 |
new file mode 100644 |
204 |
index 0000000..3b1a293 |
205 |
--- /dev/null |
206 |
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild |
207 |
@@ -0,0 +1,94 @@ |
208 |
+# Copyright 1999-2011 Gentoo Foundation |
209 |
+# Distributed under the terms of the GNU General Public License v2 |
210 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild,v 1.2 2011/07/03 05:36:21 nirbheek Exp $ |
211 |
+ |
212 |
+EAPI="3" |
213 |
+inherit eutils toolchain-funcs multilib python versionator |
214 |
+ |
215 |
+MY_PN="js" |
216 |
+TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))" |
217 |
+MY_P="${MY_PN}-${PV}" |
218 |
+TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0" |
219 |
+DESCRIPTION="Stand-alone JavaScript C library" |
220 |
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/" |
221 |
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz" |
222 |
+ |
223 |
+LICENSE="NPL-1.1" |
224 |
+SLOT="0" |
225 |
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
226 |
+IUSE="debug static-libs test" |
227 |
+ |
228 |
+S="${WORKDIR}/${MY_P}" |
229 |
+BUILDDIR="${S}/js/src" |
230 |
+ |
231 |
+RDEPEND=">=dev-libs/nspr-4.7.0" |
232 |
+DEPEND="${RDEPEND} |
233 |
+ app-arch/zip |
234 |
+ =dev-lang/python-2*[threads] |
235 |
+ dev-util/pkgconfig" |
236 |
+ |
237 |
+pkg_setup(){ |
238 |
+ python_set_active_version 2 |
239 |
+ |
240 |
+ export LC_ALL="C" |
241 |
+} |
242 |
+ |
243 |
+src_prepare() { |
244 |
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43 |
245 |
+ epatch "${FILESDIR}/${P}-fix-install-symlinks.patch" |
246 |
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9 |
247 |
+ epatch "${FILESDIR}/${P}-fix-ppc64.patch" |
248 |
+ |
249 |
+ epatch_user |
250 |
+ |
251 |
+ if [[ ${CHOST} == *-freebsd* ]]; then |
252 |
+ # Don't try to be smart, this does not work in cross-compile anyway |
253 |
+ ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" |
254 |
+ fi |
255 |
+} |
256 |
+ |
257 |
+src_configure() { |
258 |
+ local myopts |
259 |
+ |
260 |
+ if use debug ; then |
261 |
+ myopts="--enable-debug \ |
262 |
+ --enable-debugger-info-modules \ |
263 |
+ --enable-debug-symbols" |
264 |
+ fi |
265 |
+ |
266 |
+ cd "${BUILDDIR}" |
267 |
+ |
268 |
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" \ |
269 |
+ econf \ |
270 |
+ ${myopts} \ |
271 |
+ --enable-jemalloc \ |
272 |
+ --enable-readline \ |
273 |
+ --enable-threadsafe \ |
274 |
+ --with-system-nspr \ |
275 |
+ $(use_enable static-libs static) \ |
276 |
+ $(use_enable test tests) |
277 |
+} |
278 |
+ |
279 |
+src_compile() { |
280 |
+ cd "${BUILDDIR}" |
281 |
+ emake || die |
282 |
+} |
283 |
+ |
284 |
+src_test() { |
285 |
+ cd "${BUILDDIR}/jsapi-tests" |
286 |
+ emake check || die |
287 |
+} |
288 |
+ |
289 |
+src_install() { |
290 |
+ cd "${BUILDDIR}" |
291 |
+ emake DESTDIR="${D}" install || die |
292 |
+ dobin shell/js ||die |
293 |
+ dodoc ../../README || die |
294 |
+ dohtml README.html || die |
295 |
+ |
296 |
+ if ! use static-libs; then |
297 |
+ # We can't actually disable building of static libraries |
298 |
+ # They're used by the tests and in a few other places |
299 |
+ find "${D}" -iname '*.a' -delete || die |
300 |
+ fi |
301 |
+} |