diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2012-01-30 19:36:18 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2012-01-30 19:36:18 +0000 |
| commit | 3f701cafc22275a917d22b5b3f719107b13adf85 (patch) | |
| tree | e7a14c09570a4eecacd1bcbda7b890212d1a128a /dev-lang | |
| parent | Don't call python_convert_shebangs(). This package doesn't install any Python... (diff) | |
| download | gentoo-2-3f701cafc22275a917d22b5b3f719107b13adf85.tar.gz gentoo-2-3f701cafc22275a917d22b5b3f719107b13adf85.tar.bz2 gentoo-2-3f701cafc22275a917d22b5b3f719107b13adf85.zip | |
Provide complete arm support, bug #401381
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
4 files changed, 67 insertions, 44 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog index d18d65196dd5..4f491b984d1b 100644 --- a/dev-lang/spidermonkey/ChangeLog +++ b/dev-lang/spidermonkey/ChangeLog @@ -1,6 +1,11 @@ # 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.71 2012/01/25 14:34:43 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.72 2012/01/30 19:36:18 anarchy Exp $ + + 30 Jan 2012; <anarchy@gentoo.org> spidermonkey-1.8.5-r1.ebuild, + -files/spidermonkey-1.8.5-arm_resprect_cflags.patch, + +files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch: + Provide complete arm support, bug #401381 25 Jan 2012; <anarchy@gentoo.org> spidermonkey-1.8.5-r1.ebuild: Ensure we regenerate configure diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch new file mode 100644 index 000000000000..7c9dd843afdb --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags-1.patch @@ -0,0 +1,58 @@ +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -3550,7 +3550,7 @@ AC_MSG_CHECKING(for ARM NEON support in + _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");], +@@ -4687,9 +4687,9 @@ if test -n "$MOZ_THUMB2"; then + 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" ++ CFLAGS="$CFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS" ++ CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS" ++ ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $MOZ_ARM_VFP_FLAGS" + else + AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) + fi +@@ -4703,9 +4703,9 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the + 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" ++ CFLAGS="$CFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS" ++ CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS" ++ ASFLAGS="$ASFLAGS -march=armv7-a -marm $MOZ_ARM_VFP_FLAGS" + else + AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains]) + fi +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -354,7 +354,7 @@ ASFILES += TrampolineSUNWX86.s + endif + endif + endif +-ifeq (arm, $(TARGET_CPU)) ++ifeq (arm, $(findstring arm,$(TARGET_CPU))) + #CPPSRCS += only_on_arm.cpp + endif + # +@@ -436,7 +436,7 @@ else + #CPPSRCS += only_on_x86.cpp + endif + endif +-ifeq (arm, $(TARGET_CPU)) ++ifeq (arm, $(findstring arm,$(TARGET_CPU))) + #CPPSRCS += only_on_arm.cpp + endif + # + 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 deleted file mode 100644 index bd6bf8381989..000000000000 --- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 9823c43575ed..687c49e80ca8 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-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.4 2012/01/25 14:34:43 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.5 2012/01/30 19:36:18 anarchy Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -40,7 +40,7 @@ src_prepare() { # 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 "${FILESDIR}/${P}-arm_resprect_cflags-1.patch" epatch_user @@ -49,7 +49,7 @@ src_prepare() { ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" fi - cd ${S}/js/src + cd "${S}"/js/src eautoconf } |