From f73a6e2748ceda8439b5ce6cb2fa770e4dfd2045 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 29 Jan 2012 15:35:54 +0100 Subject: [PATCH] [dev-lang/spidermonkey] complete ARMv7 patchwork --- dev-lang/spidermonkey/Manifest | 4 ++-- .../files/spidermonkey-1.8.5-fix-arm-crap.patch | 9 +++++++++ dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild | 7 +++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index ced33188e..f35024a98 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -1,6 +1,6 @@ -AUX spidermonkey-1.8.5-fix-arm-crap.patch 2264 RMD160 2f3b07ec4d8316094de148ffaedfd5f487c7e077 SHA1 fd6ac1dbe6dd0bb97fdf27de92e477da5bf75ebe SHA256 4a8b903a069a259aedaf679e69a36a1e758a467093dccdcf020091edb3b77af3 +AUX spidermonkey-1.8.5-fix-arm-crap.patch 2552 RMD160 e35f9b5b4082a6f196a9e2f3f1dd24d7401ab584 SHA1 d79fa3598879d5fe8f007145a86250ed6448a2a7 SHA256 9e65c7d63001914b2edb5bde50a616ea07882199ab6861b74ee28dbea0bc7cfe AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 RMD160 0a6e799e6b47c0011ba02c877e0d190ae3830c62 SHA1 b0f776c06e956024fb0f0553f8056bbce0830273 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823 AUX spidermonkey-1.8.5-fix-ppc64.patch 849 RMD160 def597b1b913385b908da7e09683c23bc5e6e61d SHA1 4700b680441e65854e9fb3108218ea9f0f8d264d SHA256 5cfdb6a590e02c83cd15732e417da9fdd26bd65490fe07e21c173d375e3c6abc DIST js185-1.0.0.tar.gz 6164605 RMD160 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005 SHA1 52a01449c48d7a117b35f213d3e4263578d846d6 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 -EBUILD spidermonkey-1.8.5-r1.ebuild 2665 RMD160 95f6bba8d6d3b901d9fc6437d0b8f237846c03ee SHA1 018baa192f6ffb9ada7bf3fc8bea6a263ec44678 SHA256 06490375fb151b1d33934140b9aa0a84c3e6a301821114a78fd886a8bcb3890a +EBUILD spidermonkey-1.8.5-r1.ebuild 2919 RMD160 0c6463651b0bd557180a3dc87cfde1ad3d3f0c88 SHA1 c9b7277adbdbe02115bc2bd8f659c3e487d00ffb SHA256 653cbd35843657c2acb249fda3e6bc13481b744532655040b5ac12bd4019bc61 MISC metadata.xml 523 RMD160 b40a1ffd94bc32fd5045b99160481c2b95d69d30 SHA1 91eb56541e242621c81e38eb9e9f0c4dea6f099f SHA256 876e7996ea990b78088ea8ef1f0445658fea0bb7cf0a1e07cd1db2bae870307f diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm-crap.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm-crap.patch index 831eaf2c7..9b40c2879 100644 --- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm-crap.patch +++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm-crap.patch @@ -46,6 +46,15 @@ #CPPSRCS += only_on_arm.cpp endif # +@@ -382,7 +382,7 @@ CPPSRCS += checks.cc \ + # END enclude sources for V8 dtoa + ############################################# + +-ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU))) ++ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU))) + + VPATH += $(srcdir)/assembler \ + $(srcdir)/assembler/wtf \ @@ -436,7 +436,7 @@ else #CPPSRCS += only_on_x86.cpp endif diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild index 1f97367d4..c9ebd7ffc 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild @@ -40,7 +40,14 @@ src_prepare() { epatch "${FILESDIR}/${P}-fix-install-symlinks.patch" # https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9 epatch "${FILESDIR}/${P}-fix-ppc64.patch" + # Sabayon: armv7 fixes + # reconf due to fix-arm-crap.patch (this rebuilds Makefile.in + # and allows for proper patching it [hack, determine why + # if forces "arm" instead of "arm%" on: + # ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU))) + # ]) + cd "${BUILDDIR}" && eautoreconf # Fix compilation on ARMv7, causes configure to fail due to -mfloat-abi=softfp # being there when it shouldn't be. Similar to pixman issue: # https://bugzilla.mozilla.org/show_bug.cgi?id=618570