diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2012-01-25 14:26:54 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2012-01-25 14:26:54 +0000 |
| commit | fb662570393d2c1bb6c4c09ff689406f381c8274 (patch) | |
| tree | 47d93bed1f27daaf50beca0c3fa7a4efba3e7b4a /dev-lang | |
| parent | Fix ppc64 support, bug #388217 (diff) | |
| download | gentoo-2-fb662570393d2c1bb6c4c09ff689406f381c8274.tar.gz gentoo-2-fb662570393d2c1bb6c4c09ff689406f381c8274.tar.bz2 gentoo-2-fb662570393d2c1bb6c4c09ff689406f381c8274.zip | |
Spidermonkey-1.8.5 respect arm cflags, bug #400727
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/spidermonkey/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags.patch | 40 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild | 6 |
3 files changed, 49 insertions, 3 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog index 5a18d7eebabc..d4470643ce6b 100644 --- a/dev-lang/spidermonkey/ChangeLog +++ b/dev-lang/spidermonkey/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/spidermonkey # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.69 2012/01/25 14:11:54 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.70 2012/01/25 14:26:54 anarchy Exp $ + + 25 Jan 2012; <anarchy@gentoo.org> spidermonkey-1.8.5-r1.ebuild, + +files/spidermonkey-1.8.5-arm_resprect_cflags.patch: + Spidermonkey-1.8.5 respect arm cflags, bug #400727 25 Jan 2012; <anarchy@gentoo.org> files/spidermonkey-1.8.5-fix-ppc64.patch: Fix ppc64 support bug #388217 diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags.patch new file mode 100644 index 000000000000..bd6bf8381989 --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags.patch @@ -0,0 +1,40 @@ +diff -ur a/js/src/configure.in b/js/src/configure.in +--- a/js/src/configure.in 2011-07-17 13:43:42.000000000 +0200 ++++ b/js/src/configure.in 2011-07-17 13:47:39.000000000 +0200 +@@ -4607,9 +4607,6 @@ + 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 +@@ -4623,9 +4620,6 @@ + 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 +@@ -4634,16 +4628,6 @@ + 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) diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild index 8da2b799c092..fadbf9515b89 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.2 2011/11/26 04:49:25 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.3 2012/01/25 14:26:54 anarchy Exp $ EAPI="3" inherit eutils toolchain-funcs multilib python versionator pax-utils @@ -38,6 +38,8 @@ 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" + # https://bugs.gentoo.org/show_bug.cgi?id=400727 + epatch "${FILESDIR}/${P}-arm_resprect_cflags.patch" epatch_user |