Source: icedove
Version: 31.3.0-1
Severity: wishlist
Tags: patch
User: debian-powerpc...@breakpoint.cc
Usertags: powerpcspe
Hi,
icedove FTBFS on powerpcspe as follows:
...
transform_util.o
gcc -o transform_util.o -c -fvisibility=hidden -DMOZ_GLUE_IN_PROGRAM
-DNO_NSPR_10_SUPPORT -I/«PKGBUILDDIR»/mozilla/gfx/qcms -I.
-I../../dist/include -I/usr/include/nspr -I/usr/include/nss
-I/«PKGBUILDDIR»/obj-icedove/mozilla/dist/include -I/usr/include
-I/usr/include/pixman-1 -fPIC -D_FORTIFY_SOURCE=2 -include
../../mozilla-config.h -DMOZILLA_CLIENT -MD -MP -MF .deps/transform_util.o.pp
-D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wdeclaration-after-statement
-Werror=return-type -Werror=int-to-pointer-cast -Wtype-limits -Wempty-body
-Wsign-compare -Wno-unused -Wcast-align -g -O2 -fstack-protector-strong
-Wformat -Werror=format-security -std=gnu99 -fgnu89-inline -fno-strict-aliasing
-ffunction-sections -fdata-sections -fno-math-errno -pthread -pipe -DNDEBUG
-DTRIMMED -g -Os -freorder-blocks -fomit-frame-pointer
-Wno-missing-field-initializers
/«PKGBUILDDIR»/mozilla/gfx/qcms/transform_util.c
transform-altivec.o
gcc -o transform-altivec.o -c -fvisibility=hidden -DMOZ_GLUE_IN_PROGRAM
-DNO_NSPR_10_SUPPORT -I/«PKGBUILDDIR»/mozilla/gfx/qcms -I.
-I../../dist/include -I/usr/include/nspr -I/usr/include/nss
-I/«PKGBUILDDIR»/obj-icedove/mozilla/dist/include -I/usr/include
-I/usr/include/pixman-1 -fPIC -D_FORTIFY_SOURCE=2 -include
../../mozilla-config.h -DMOZILLA_CLIENT -MD -MP -MF
.deps/transform-altivec.o.pp -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith
-Wdeclaration-after-statement -Werror=return-type -Werror=int-to-pointer-cast
-Wtype-limits -Wempty-body -Wsign-compare -Wno-unused -Wcast-align -g -O2
-fstack-protector-strong -Wformat -Werror=format-security -std=gnu99
-fgnu89-inline -fno-strict-aliasing -ffunction-sections -fdata-sections
-fno-math-errno -pthread -pipe -DNDEBUG -DTRIMMED -g -Os -freorder-blocks
-fomit-frame-pointer -Wno-missing-field-initializers -maltivec
/«PKGBUILDDIR»/mozilla/gfx/qcms/transform-altivec.c
/«PKGBUILDDIR»/mozilla/gfx/qcms/transform-altivec.c:1:0: error: AltiVec and SPE
instructions cannot coexist
/* vim: set ts=8 sw=8 noexpandtab: */
^
make[7]: *** [transform-altivec.o] Error 1
/«PKGBUILDDIR»/mozilla/config/rules.mk:969: recipe for target
'transform-altivec.o' failed
make[7]: Leaving directory '/«PKGBUILDDIR»/obj-icedove/mozilla/gfx/qcms'
...
The attached patch fixes this.
Thanks in advance,
Roland
-- System Information:
Debian Release: 7.0
APT prefers unreleased
APT policy: (500, 'unreleased'), (500, 'unstable')
Architecture: powerpcspe (ppc)
Kernel: Linux 3.9.0-dirty (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
Index: icedove-31.3.0/mozilla/gfx/qcms/moz.build
===================================================================
--- icedove-31.3.0.orig/mozilla/gfx/qcms/moz.build 2014-11-27 23:16:46.000000000 +0100
+++ icedove-31.3.0/mozilla/gfx/qcms/moz.build 2014-12-10 16:03:14.900461737 +0100
@@ -38,6 +38,9 @@
if CONFIG['GNU_CC']:
use_altivec = True
+if 'gnuspe' in CONFIG['target']:
+ use_altivec = False
+
if use_sse1:
SOURCES += ['transform-sse1.c']
SOURCES['transform-sse1.c'].flags += CONFIG['SSE_FLAGS']
Index: icedove-31.3.0/mozilla/gfx/qcms/transform.c
===================================================================
--- icedove-31.3.0.orig/mozilla/gfx/qcms/transform.c 2014-11-27 23:16:46.000000000 +0100
+++ icedove-31.3.0/mozilla/gfx/qcms/transform.c 2014-12-11 09:54:17.959894881 +0100
@@ -1291,7 +1291,7 @@
#endif
} else
#endif
-#if (defined(__POWERPC__) || defined(__powerpc__))
+#if ((defined(__POWERPC__) || defined(__powerpc__)) && !defined(__NO_FPRS__))
if (have_altivec()) {
if (in_type == QCMS_DATA_RGB_8)
transform->transform_fn = qcms_transform_data_rgb_out_lut_altivec;
