From: "Ian Stakenvicius" <axs@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
Date: Thu, 6 Dec 2012 21:29:57 +0000 (UTC) [thread overview]
Message-ID: <1354829352.d24108930aafba504f8f886f59b5d90bbb530289.axs@gentoo> (raw)
commit: d24108930aafba504f8f886f59b5d90bbb530289
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 6 21:29:12 2012 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Dec 6 21:29:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=d2410893
symbol-versioned spidermonkeys, to roll out to the tree soon
---
dev-lang/spidermonkey/Manifest | 9 ++-
.../spidermonkey-1.8.5-arm_respect_cflags-3.patch | 99 ++++++++++++++++++++
.../files/spidermonkey-1.8.5-fix-ppc64.patch | 61 ++++++++++++
.../spidermonkey-1.8.5-perf_event-check.patch | 21 ++++
.../files/spidermonkey-1.8.5-symbol-versions.patch | 32 +++++++
.../files/spidermonkey-1.8.7-jsversion.patch | 11 --
.../files/spidermonkey-1.8.7-symbol-versions.patch | 32 +++++++
....8.7-r1.ebuild => spidermonkey-1.8.5-r3.ebuild} | 50 ++++------
....8.7-r1.ebuild => spidermonkey-1.8.7-r2.ebuild} | 5 +-
9 files changed, 278 insertions(+), 42 deletions(-)
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 61dfce6..b09b05b 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,7 +1,14 @@
+AUX spidermonkey-1.8.5-arm_respect_cflags-3.patch 3474 SHA256 2f0a33c7d70e98c231619cf28de151e6961f7fd163a9b02588c75bb3740f6380 SHA512 55726ddffe88c025eac331918b5f12223ccf47a2a2f3f6bb020fd6fc027e558dee811b80d2328dc631daf7d372b10c51004ee4a4ca87e8c1aa2e68f562bf1244 WHIRLPOOL b8a1738080680670cdaa5e4a9d603137c34dd0468448e7c51d6a7ae0d41ce69a74ac2e880d5db7d38171f979d564bd78a8e64fae419d5119558e5eb71a0a5792
AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823 SHA512 738f59260900e2dee42a3a8347c5afa09cc99e0e7f267c7af80b29a115818c61dce6912d5ff98c1bbcaea816c4d8579383eb7f6a848ba5d4b9275ec6baa2f01d WHIRLPOOL 210390d31e93c7a96fb61951b93221dbd34a1572476dbbf91e0ae3bcfd06d10194205411c49c47ea7d8fa6f898d0c96366c5b6fd3927d12d787524b674d85b81
+AUX spidermonkey-1.8.5-fix-ppc64.patch 1669 SHA256 ffae38a7e5db0895e10be924e1bd084e57640c7a184cd8f1b1a90e9533202470 SHA512 0352665ae138e15aabc8b40561ac6d5328b7a1c497f9591ebe57ffacb05a0ba52c677b8174829c5328cb79ea271b519287bfb99bd418efefc3409d18a198b7d9 WHIRLPOOL 699b3d0a75d660fba0a6095b19db84504238b2c3f9f0bcddf1d6628c8a51a70301c2a3eb54712c2e7719ca5bd4184562d64fac22760e870e453ea2feb5456870
+AUX spidermonkey-1.8.5-perf_event-check.patch 694 SHA256 c24f4c5b445e4ac20a35e0baf11649b1697d0d0c10e08406d07f9e3d311f8135 SHA512 d974135f6f6897529d482d7ac7ba79031471ed677c646462dd919a36313d05e3720c394afa9b143a7c1f681d5612fc8011faaebc5ba54712790d878d6002fa73 WHIRLPOOL 511e9904f32c4be3c4d73dd760a4c68159e101a4963d895a1b891dd6317a1713c83f95f12cea4de7f80224e8a0f15e0cd490c1eaa3c193e07c7733b5941039cc
+AUX spidermonkey-1.8.5-symbol-versions.patch 1011 SHA256 41bda93bc2309621ece16c2b659a25e94785b8d2a0ca6c983b32f5c50d266ab7 SHA512 8e8f8ea70d87441be070ef5c199ad9589cf4ebedb2ea5bff972aec3c819f3aef517f7dcb1ffac1508dcfcac07cbf2d4bfb8b2b29f1f2c487410de1484e9aa95f WHIRLPOOL e0b0fc506e71a4b4961b2aadd26f86b4499687cba98c56b5e4861ef4acc0e11849af234febc0a2ed2aee603748df87ce8fd0a83484757af1b697d09c65bf8945
AUX spidermonkey-1.8.7-filter_desc.patch 922 SHA256 7a3832a0a47f90b89a240b44ac580fff8740344c1d3eee0624973cb251043c46 SHA512 f4b2f3b8b48b0418ab2572dcedc927c4e415979b2dff0f89614cab8b6c6b33e8d0ecf0d298ecdd5c125e936db98028261a59b6f4917384e060999e07ff7b92be WHIRLPOOL 186c2f2ba04170005a5af7cce773ef92925015a1e4541f40d2d44641b9dda5048a2b3d8953755860e866893043ae666360c8a7b594eda77858851c937d5ca8c0
AUX spidermonkey-1.8.7-freebsd-pthreads.patch 175 SHA256 0cc365e8c43c2eeae316382db53f287852b1419851c3ddb412dc60bc22be126f SHA512 43daf55711910fba2927d8e80fa6d786252fcaf3ba31bf2b471b4ebb987ec94a006618b9a423363afb016fa35affdf974c4e4a12dc0070dbfaebab1aa65badc7 WHIRLPOOL bf985a328fd7e5ae0dc8406171b0738b5d55001a9067b5592318c614cf664843432e38228199f7de28043c8199a0e807c117ec7f5aecf3452be7f84098295e08
+AUX spidermonkey-1.8.7-symbol-versions.patch 1011 SHA256 a0706551d4ff71a984b2b9444901dc98b60a390488c8b99691c7d0d01f7111e7 SHA512 16fa4bab5da4724a8b3c925133a85975bf1bfb47e4b6bfcae1c2f76eed824ea82b321928fc478966686a3582e0cd03630177b041ab75f2c572f7f00d3e3e2242 WHIRLPOOL 8118ea4845394b36c6f5ec8914b66e5b9fadc83bc6f696d0814ff68167e397c3e685a96b4fa3ce0647fe76337b592b778e640b6429095ec0fea2883d0e44777a
AUX spidermonkey-1.8.7-x32.patch 753 SHA256 0b223162cf7067d1dbbb950708265ccf20637fe4906564080d9c9c38b85e826d SHA512 ae9c0241fd1cc02b5f21865adb1efb750246850dcf93ee1b81c5faf19c5d4d5b0ab6e853527899c438d2139601e8a177f7ee6c9a3700d2816df32f5e09d273e8 WHIRLPOOL 8b43164a8a7cc4d82092e81d4a2d0d21a8614dfe7964f3fbb49d0f70e25178ba0197bd525e9f08cb1c621d991dd4aefc97be15901d3f482fce180e8d90bf8706
+DIST js185-1.0.0.tar.gz 6164605 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 WHIRLPOOL 58b372713275874d3ae3c6b58c12c56bf8d17d024d591e321538bcdd8e615332e41655954368ce86b90e970209e3fd650c39d931000880f5ec22cb044b5d7a4e
DIST js187-1.0.0.tar.gz 7106870 SHA256 ce80a9eabdaf22d2a1c4830ea36120e6af207bb336bea8f6d34cba32f59fe2b4 SHA512 7df55daac1eac0a7a7b31df044f7d5cc40a1f5079907b661f7c8489614b0ddff35e4f7cd13214bfc4baf9bdb37d392e4118f63ab589a051978d6ceef63d1e9f2 WHIRLPOOL d0f2ea8add0c7c1ac34ff8a6f887e931768091696dda037e7778ecd7eb02889b455747cfaa9a362844983eb2bdda6bddab46bf542cecf81f91ec5165efc0b9a3
DIST spidermonkey-1.8.7-patches-0.1.tar.xz 4796 SHA256 ddc0431ed9a96b67c27787fa824f4456693b9361dbb41366f8196d1a3425a353 SHA512 bd1976b12940390e7d5db6078ca6339006428874788688e4ea4f6bd86afd341c3edd356bac801883637f46085c6d971d4f79e44fa9f6e44b3b715186355be175 WHIRLPOOL 5614bcb99d7101751e6f5be24b20e8a6acd5a682640025830f0c4a4fb74e724e5d71eb56c3e09d0ced4bbfa6c6c93daf42a7bc326c3cf0b07bee777901f25039
-EBUILD spidermonkey-1.8.7-r1.ebuild 3805 SHA256 33a2f0c0716b811b298cd33c4139c115a32cec0d5516e7bd15a3ea367e803291 SHA512 cec59abecffb2efe6f34fb3cfab9ca7cc46d540b15136981187a8f3be790a7b0e4d679a4f87e1dc0ac346af90dde90dd96b1389f31318716b5fe44fc790802c8 WHIRLPOOL 5ab97e30ca0c23feb72697c576198307a60eedb3b34568e96d4f5a991d9aeddb6006edcd0f766161bd0995fc7ce53f4f8765a3e6d463e0a89a84f82b92246ef1
+EBUILD spidermonkey-1.8.5-r3.ebuild 3823 SHA256 5e828c14f3026e2f683ec722a7010f482fbbf3bb3725bfddf8f0965e196b420e SHA512 45dcb9dd01d6461ab07c447e7d9b74317b269028ade0e9622256e872a9440abc280c4130b331a44fbf52d9538c357d4e8901045d8c2c064577cb5141f03a4993 WHIRLPOOL fc6b1183c48be41c38e4deeb959349ab1188a485425ab5122218a689b3d72125235a009603a8a4baae310e5750bf453d51a82c3e781282c6ef3c76661ab28734
+EBUILD spidermonkey-1.8.7-r2.ebuild 3953 SHA256 774a6ffe16fdc25278410dacccb797063c5a372697e95fc7c76c3b73a36b96ce SHA512 ec87ac2352305d3263647fe0d8e61afcc75ff40440e2b04d2aca93849c556acc43ae379d12f03b2fa8ea76e4a99848e20ec3e723cd3d241f745ad796db31c4b0 WHIRLPOOL 04919be59e10af466f1a2c572964f946d539f7f02d0b4fcfb26e9ebb7282141dd55262b0bc485d2abb568c536e06c21ed2b5e793ab3e83d88063fe02f37efce1
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch
new file mode 100644
index 0000000..ed497ce
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-3.patch
@@ -0,0 +1,99 @@
+--- a/js-1.8.5/js/src/configure.in 2011-03-31 15:08:36.000000000 -0400
++++ b/js-1.8.5/js/src/configure.in 2012-11-02 15:32:38.000000000 -0400
+@@ -3550,7 +3550,7 @@
+ _SAVE_CFLAGS="$CFLAGS"
+ if test "$GNU_CC"; then
+ # gcc needs -mfpu=neon to recognize NEON instructions
+- CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
++ CFLAGS="$CFLAGS -mfpu=neon"
+ fi
+ AC_TRY_COMPILE([],
+ [asm("vadd.i8 d0, d0, d0");],
+@@ -4654,12 +4654,6 @@
+ dnl ========================================================
+ MOZ_ARG_HEADER(Individual module options)
+
+-dnl Setup default CPU arch for arm target
+-case "$target_cpu" in
+- arm*)
+- MOZ_ARM_ARCH=armv7
+- ;;
+-esac
+ dnl ========================================================
+ dnl = Enable building the Thumb2 instruction set
+ dnl ========================================================
+@@ -4668,66 +4662,32 @@
+ MOZ_THUMB2=1,
+ MOZ_THUMB2=)
+ if test -n "$MOZ_THUMB2"; then
+- MOZ_ARM_ARCH=armv7
++ AC_MSG_WARN([thumb2 enabled instead of autodetected -- hope you know what you are doing])
++else
++ AC_MSG_CHECKING([whether to build for thumb2])
++ AC_TRY_COMPILE([],[return sizeof(__thumb2__);],
++ [MOZ_THUMB2=1
++ AC_MSG_RESULT([yes])],
++ [MOZ_THUMB2=
++ AC_MSG_RESULT([no])])
+ fi
+
+ dnl ========================================================
+ dnl = Enable building for ARM specific CPU features
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(cpu-arch,
+-[ --with-cpu-arch=arch Use specific arm architecture CPU features, default armv7],
+- MOZ_ARM_ARCH=$withval)
+-
+ if test -n "$MOZ_THUMB2"; then
+ case "$target_cpu" in
+ arm*)
+- if test "$MOZ_ARM_ARCH" != "armv7"; then
+- AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH])
+- fi
+ if test "$GNU_CC"; then
+ AC_DEFINE(MOZ_THUMB2)
+- AC_DEFINE(MOZ_ARM_ARCH)
+- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+ else
+ AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+ fi
+ ;;
+- *)
+- AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures])
+- ;;
+- esac
+-elif test "$MOZ_ARM_ARCH" = "armv7"; then
+- case "$target_cpu" in
+- arm*)
+- if test "$GNU_CC"; then
+- AC_DEFINE(MOZ_ARM_ARCH)
+- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+- else
+- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+- fi
+- ;;
+- *)
+- AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
+- ;;
+- esac
+-else
+- case "$target_cpu" in
+- arm*)
+- if test "$GNU_CC"; then
+- CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+- CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+- ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+- fi
+- ;;
+ esac
+ fi
+
+ AC_SUBST(MOZ_THUMB2)
+-AC_SUBST(MOZ_ARM_ARCH)
+
+ dnl ========================================================
+ dnl =
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
new file mode 100644
index 0000000..3927c87
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
@@ -0,0 +1,61 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1303461188 -7200
+# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
+# Parent c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
+Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -383,17 +383,17 @@ CPPSRCS += checks.cc \
+ platform.cc \
+ utils.cc \
+ $(NONE)
+
+ #
+ # END enclude sources for V8 dtoa
+ #############################################
+
+-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
++ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
+
+ VPATH += $(srcdir)/assembler \
+ $(srcdir)/assembler/wtf \
+ $(srcdir)/yarr/pcre \
+ $(NULL)
+
+ CPPSRCS += pcre_compile.cpp \
+ pcre_exec.cpp \
+
+# HG changeset patch
+# User Luke Wagner <lw@mozilla.com>
+# Date 1299520258 28800
+# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
+# Parent 27e5814815491ebb68e474e453aff6c2ea908c43
+Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
+
+diff --git a/js/src/jsval.h b/js/src/jsval.h
+--- a/js/src/jsval.h
++++ b/js/src/jsval.h
+@@ -342,16 +342,17 @@ typedef union jsval_layout
+ JSValueTag tag : 17;
+ uint64 payload47 : 47;
+ } debugView;
+ struct {
+ union {
+ int32 i32;
+ uint32 u32;
+ JSWhyMagic why;
++ jsuword word;
+ } payload;
+ } s;
+ double asDouble;
+ void *asPtr;
+ } jsval_layout;
+ # endif /* JS_BITS_PER_WORD */
+ #endif /* defined(IS_LITTLE_ENDIAN) */
+
+
+
+
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch
new file mode 100644
index 0000000..66475b6
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-perf_event-check.patch
@@ -0,0 +1,21 @@
+--- a/js/src/configure.in 2012-11-01 19:42:20.130330321 +0100
++++ b/js/src/configure.in 2012-11-01 20:34:03.561351492 +0100
+@@ -3477,7 +3477,16 @@
+ esac
+
+ dnl Performance measurement headers.
+-AC_CHECK_HEADER(linux/perf_event.h, HAVE_LINUX_PERF_EVENT_H=1)
++AC_CHECK_HEADER(linux/perf_event.h,
++ [AC_CACHE_CHECK(for perf_event_open system call,ac_cv_perf_event_open,
++ [AC_TRY_COMPILE([#include <sys/syscall.h>],[return sizeof(__NR_perf_event_open);],
++ ac_cv_perf_event_open=yes,
++ ac_cv_perf_event_open=no)])])
++if test "$ac_cv_perf_event_open" = "yes"; then
++ HAVE_LINUX_PERF_EVENT_H=1
++else
++ HAVE_LINUX_PERF_EVENT_H=
++fi
+ AC_SUBST(HAVE_LINUX_PERF_EVENT_H)
+
+ dnl Checks for libraries.
+
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch
new file mode 100644
index 0000000..460394d
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-symbol-versions.patch
@@ -0,0 +1,32 @@
+diff -Naur js/src/configure.in js.new/src/configure.in
+--- a/js/src/symverscript.in 2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/symverscript.in 2012-11-07 09:37:05.000000000 -0500
+@@ -0,0 +1,4 @@
++mozjs185 {
++ global: *;
++};
++
+diff -Naur js/src/Makefile.in js.new/src/Makefile.in
+--- a/js/src/Makefile.in 2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/Makefile.in 2012-11-07 09:37:09.000000000 -0500
+@@ -837,7 +837,10 @@
+ mozjs185.pc \
+ $(NULL)
+
+-GARBAGE += $(pkg_config_files)
++symverscript: symverscript.in
++ cat $< > $@
++
++GARBAGE += $(pkg_config_files) symverscript
+
+ %.pc: $(srcdir)/%.pc.in Makefile
+ cat $< | sed \
+@@ -872,6 +875,8 @@
+ SHLIB_ABI_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
+ SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
+ $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
++$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
++$(SHARED_LIBRARY): symverscript
+ endif
+ endif
+
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-jsversion.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-jsversion.patch
deleted file mode 100644
index 22f4d08..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-jsversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/js/src/dist/include/jsversion.h 2012-04-06 17:24:51.000000000 -0400
-+++ b/js/src/dist/include/jsversion.h 2012-10-12 16:52:50.000000000 -0400
-@@ -41,7 +41,7 @@
- * JS configuration macros.
- */
- #ifndef JS_VERSION
--#define JS_VERSION 185
-+#define JS_VERSION 187
- #endif
-
- /*
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-symbol-versions.patch
new file mode 100644
index 0000000..3945172
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-symbol-versions.patch
@@ -0,0 +1,32 @@
+diff -Naur js/src/configure.in js.new/src/configure.in
+--- a/js/src/symverscript.in 2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/symverscript.in 2012-11-07 09:37:05.000000000 -0500
+@@ -0,0 +1,4 @@
++mozjs187 {
++ global: *;
++};
++
+diff -Naur js/src/Makefile.in js.new/src/Makefile.in
+--- a/js/src/Makefile.in 2012-11-07 09:36:16.000000000 -0500
++++ b/js/src/Makefile.in 2012-11-07 09:37:09.000000000 -0500
+@@ -837,7 +837,10 @@
+ mozjs185.pc \
+ $(NULL)
+
+-GARBAGE += $(pkg_config_files)
++symverscript: symverscript.in
++ cat $< > $@
++
++GARBAGE += $(pkg_config_files) symverscript
+
+ %.pc: $(srcdir)/%.pc.in Makefile
+ cat $< | sed \
+@@ -872,6 +875,8 @@
+ SHLIB_ABI_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
+ SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
+ $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
++$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
++$(SHARED_LIBRARY): symverscript
+ endif
+ endif
+
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
similarity index 73%
copy from dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
copy to dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
index dfa34e0..c3dfe48 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.10 2012/10/04 17:13:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild,v 1.5 2012/11/25 13:09:41 anarchy Exp $
EAPI="5"
WANT_AUTOCONF="2.1"
@@ -10,22 +10,19 @@ MY_PN="js"
TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
MY_P="${MY_PN}-${PV}"
TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-SPIDERPV="${PV}-patches-0.1"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
- http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
LICENSE="NPL-1.1"
-SLOT="0/mozjs187"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug jit minimal static-libs test"
+SLOT="0/mozjs185"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug minimal static-libs test"
S="${WORKDIR}/${MY_P}"
BUILDDIR="${S}/js/src"
-RDEPEND=">=dev-libs/nspr-4.7.0
- virtual/libffi"
+RDEPEND=">=dev-libs/nspr-4.7.0"
DEPEND="${RDEPEND}
app-arch/zip
=dev-lang/python-2*[threads]
@@ -38,14 +35,19 @@ pkg_setup(){
}
src_prepare() {
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/spidermonkey"
-
- epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
- epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+ epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
+ epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+ # https://bugs.gentoo.org/show_bug.cgi?id=400727
+ # https://bugs.gentoo.org/show_bug.cgi?id=420471
+ epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
+ # https://bugs.gentoo.org/show_bug.cgi?id=438746
epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
- epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=441928
+ epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=439260
+ epatch "${FILESDIR}"/${P}-symbol-versions.patch
epatch_user
@@ -70,11 +72,7 @@ src_configure() {
--enable-readline \
--enable-threadsafe \
--with-system-nspr \
- --enable-system-ffi \
- --enable-jemalloc \
$(use_enable debug) \
- $(use_enable jit tracejit) \
- $(use_enable jit methodjit) \
$(use_enable static-libs static) \
$(use_enable test tests)
}
@@ -115,19 +113,13 @@ src_test() {
src_install() {
cd "${BUILDDIR}" || die
emake DESTDIR="${D}" install
- if ! use minimal; then
+ # bug 437520 , exclude js shell for small systems
+ if ! use minimal ; then
dobin shell/js
- if use jit; then
- pax-mark m "${ED}/usr/bin/js"
- fi
+ pax-mark m "${ED}/usr/bin/js"
fi
dodoc ../../README
dohtml README.html
- # install header files needed but not part of build system
- insinto /usr/include/js
- doins ../public/*.h
- insinto /usr/include/js/mozilla
- doins "${S}"/mfbt/*.h
if ! use static-libs; then
# We can't actually disable building of static libraries
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
similarity index 94%
rename from dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
rename to dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
index dfa34e0..830deb0 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.10 2012/10/04 17:13:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r1.ebuild,v 1.1 2012/10/23 19:07:07 axs Exp $
EAPI="5"
WANT_AUTOCONF="2.1"
@@ -38,6 +38,7 @@ pkg_setup(){
}
src_prepare() {
+ # Apply patches that are required for misc archs
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/spidermonkey"
@@ -46,6 +47,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=439260
+ epatch "${FILESDIR}"/${P}-symbol-versions.patch
epatch_user
next reply other threads:[~2012-12-06 21:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-06 21:29 Ian Stakenvicius [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-09 21:22 [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/ Ian Stakenvicius
2013-04-01 18:30 Jory Pratt
2013-01-30 2:02 Ian Stakenvicius
2012-12-06 21:44 Ian Stakenvicius
2012-10-21 19:07 Jory Pratt
2012-10-12 19:58 Ian Stakenvicius
2012-06-18 18:27 Jory Pratt
2011-11-14 19:11 Jory Pratt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354829352.d24108930aafba504f8f886f59b5d90bbb530289.axs@gentoo \
--to=axs@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox