2
configure.in | 16 ++++++++++++----
3
xpcom/reflect/xptcall/src/md/unix/Makefile.in | 2 +-
4
2 files changed, 13 insertions(+), 5 deletions(-)
6
## 80_uname.patch converted from dpatch file initially by Mike Hommey <glandium@debian.org>
8
# Use ${host_*} variables instead of uname in configure.in. Closes:
10
# This is a minimalist patch to solve the particular bad assembler
11
# choice issue. It would need a much greater work to actually do
12
# something totally clean, but the current patch should be enough
14
# Also incorporates fix for bz#363263.
16
Index: iceape-1.1.4/configure.in
17
===================================================================
18
--- iceape-1.1.4.orig/configure.in
19
+++ iceape-1.1.4/configure.in
21
MOZ_ENABLE_POSTSCRIPT=1
23
if test -n "$CROSS_COMPILE"; then
24
OS_TARGET="${target_os}"
25
OS_ARCH=`echo $target_os | sed -e 's|/|_|g'`
27
OS_TEST="${target_cpu}"
28
case "${target_os}" in
29
- linux*) OS_ARCH=Linux ;;
30
+ linux*) OS_ARCH=Linux OS_TARGET=Linux;;
31
kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
32
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
33
mingw*) OS_ARCH=WINNT ;;
34
wince*) OS_ARCH=WINCE ;;
35
darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
38
- OS_TARGET=`uname -s`
39
- OS_ARCH=`uname -s | sed -e 's|/|_|g'`
40
+ OS_TARGET="${host_os}"
41
+ OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`
44
+ OS_TEST="${host_cpu}"
45
+ case "${host_os}" in
46
+ linux*) OS_ARCH=Linux OS_TARGET=Linux;;
47
+ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
48
+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
49
+ mingw*) OS_ARCH=WINNT ;;
50
+ wince*) OS_ARCH=WINCE ;;
51
+ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
56
HOST_OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`
58
#######################################################################
59
# Master "Core Components" macros for getting the OS target #
60
#######################################################################
61
Index: iceape-1.1.4/xpcom/reflect/xptcall/src/md/unix/Makefile.in
62
===================================================================
63
--- iceape-1.1.4.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in
64
+++ iceape-1.1.4/xpcom/reflect/xptcall/src/md/unix/Makefile.in
67
# #24617 Building the CPP's (CXX) optimized causes a crash
68
CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS))
74
-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
75
+ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
76
CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
77
ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
78
AS := $(CC) -c -x assembler-with-cpp