Hello community, here is the log from the commit of package js for openSUSE:Factory checked in at 2012-06-29 10:20:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/js (Old) and /work/SRC/openSUSE:Factory/.js.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "js", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/js/js.changes 2011-11-14 11:54:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.js.new/js.changes 2012-06-29 10:40:46.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 28 06:52:40 UTC 2012 - [email protected] + +- do not enforce wrong build flags on arm (fixes build) + +------------------------------------------------------------------- New: ---- do-not-enforce-wrong-arm-flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ js.spec ++++++ --- /var/tmp/diff_new_pack.tOpPYB/_old 2012-06-29 10:40:47.000000000 +0200 +++ /var/tmp/diff_new_pack.tOpPYB/_new 2012-06-29 10:40:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package js # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,24 @@ # - Name: js Summary: JavaScript interpreter -Version: 1.8.5 -Release: 3 License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Development/Languages/Other +Version: 1.8.5 +Release: 0 Url: http://www.mozilla.org/js/ Source0: http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.bz2 Patch0: js-64bitbigendian.patch Patch1: js-filter.patch +Patch2: do-not-enforce-wrong-arm-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf213 gcc-c++ mozilla-nspr-devel pkg-config python zip +BuildRequires: autoconf213 +BuildRequires: gcc-c++ +BuildRequires: mozilla-nspr-devel +BuildRequires: pkg-config +BuildRequires: python +BuildRequires: zip %description JavaScript is the Netscape-developed object scripting language used in millions @@ -38,7 +43,6 @@ %package -n libmozjs185-1_0 Summary: JavaScript library -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: System/Libraries %description -n libmozjs185-1_0 @@ -50,7 +54,6 @@ %package devel Summary: Header files, libraries and development documentation for %{name} -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Development/Libraries/Other Requires: libmozjs185-1_0 = %{version}-%{release} Requires: pkg-config @@ -65,6 +68,7 @@ %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 +%patch2 %build # no need to add build time to binaries ++++++ do-not-enforce-wrong-arm-flags.patch ++++++ --- js/src/configure.in.orig 2012-06-28 08:47:35.002113771 +0200 +++ js/src/configure.in 2012-06-28 08:49:33.384116471 +0200 @@ -3546,23 +3546,6 @@ fi AC_SUBST(HAVE_ARM_SIMD) -AC_MSG_CHECKING(for ARM NEON support in compiler) -_SAVE_CFLAGS="$CFLAGS" -if test "$GNU_CC"; then - # gcc needs -mfpu=neon to recognize NEON instructions - CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp" -fi -AC_TRY_COMPILE([], - [asm("vadd.i8 d0, d0, d0");], - result="yes", result="no") -AC_MSG_RESULT("$result") -if test "$result" = "yes"; then - AC_DEFINE(HAVE_ARM_NEON) - HAVE_ARM_NEON=1 -fi -CFLAGS="$_SAVE_CFLAGS" -AC_SUBST(HAVE_ARM_NEON) - dnl ======================================================== dnl = pthread support dnl = Start by checking whether the system support pthreads @@ -4660,74 +4643,6 @@ MOZ_ARM_ARCH=armv7 ;; esac -dnl ======================================================== -dnl = Enable building the Thumb2 instruction set -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(thumb2, - [ --enable-thumb2 Enable Thumb2 instruction set (implies ARMv7)], - MOZ_THUMB2=1, - MOZ_THUMB2=) -if test -n "$MOZ_THUMB2"; then - MOZ_ARM_ARCH=armv7 -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 = --- js/src/configure.orig 2012-06-28 08:47:28.419113621 +0200 +++ js/src/configure 2012-06-28 08:48:53.490115563 +0200 @@ -10633,42 +10633,6 @@ fi -echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6 -echo "configure:10638: checking for ARM NEON support in compiler" >&5 -_SAVE_CFLAGS="$CFLAGS" -if test "$GNU_CC"; then - # gcc needs -mfpu=neon to recognize NEON instructions - CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp" -fi -cat > conftest.$ac_ext <<EOF -#line 10645 "configure" -#include "confdefs.h" - -int main() { -asm("vadd.i8 d0, d0, d0"); -; return 0; } -EOF -if { (eval echo configure:10652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - result="no" -fi -rm -f conftest* -echo "$ac_t"""$result"" 1>&6 -if test "$result" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_ARM_NEON 1 -EOF - - HAVE_ARM_NEON=1 -fi -CFLAGS="$_SAVE_CFLAGS" - - case "$target_os" in darwin*) USE_PTHREADS=1 @@ -13292,66 +13256,6 @@ fi -if test -n "$MOZ_THUMB2"; then - case "$target_cpu" in - arm*) - if test "$MOZ_ARM_ARCH" != "armv7"; then - { echo "configure: error: --enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH" 1>&2; exit 1; } - fi - if test "$GNU_CC"; then - cat >> confdefs.h <<\EOF -#define MOZ_THUMB2 1 -EOF - - cat >> confdefs.h <<\EOF -#define MOZ_ARM_ARCH 1 -EOF - - 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 - { echo "configure: error: --enable-thumb2 is not supported for non-GNU toolchains" 1>&2; exit 1; } - fi - ;; - *) - { echo "configure: error: --enable-thumb2 is not supported for non-ARM CPU architectures" 1>&2; exit 1; } - ;; - esac -elif test "$MOZ_ARM_ARCH" = "armv7"; then - case "$target_cpu" in - arm*) - if test "$GNU_CC"; then - cat >> confdefs.h <<\EOF -#define MOZ_ARM_ARCH 1 -EOF - - 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 - { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-GNU toolchains" 1>&2; exit 1; } - fi - ;; - *) - { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-ARM CPU architectures" 1>&2; exit 1; } - ;; - 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 - - - - # Debugging and Optimizations if test -z "$MOZ_DEBUG_FLAGS"; then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
