This patch substituts $CPU to $CPUNAME in makfiles and has been
successfully built on my Linux/x86 machine. However, there are two
questions remain:
1) Statements setting $CPU="U" (looks like it should be "SPARC64")
could not be found in set_soenv.in or related files, but $(CPU)=="U"
is checked in some makefiles. I left those lines untouched in this
patch.
2) Fixing patch files directly (e.g., jpeg/jpeg-6b.patch) seems not a
good idea, though I have done it.
Please give me your advice.
Victor Lee
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 04dad27..a9ff188 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -149,12 +149,12 @@ $(eval $(call gb_Library_add_linked_libs,sb,\
))
endif
-ifeq ($(GUI)$(CPU),WNTI)
+ifeq ($(GUI)$(CPUNAME),WNTINTEL)
$(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x86 \
))
else
-ifeq ($(GUI)$(CPU),WNTX)
+ifeq ($(GUI)$(CPUNAME),WNTX86_64)
$(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x64 \
))
@@ -164,12 +164,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
))
endif
endif
-ifeq ($(GUI)$(COM)$(CPU),WNTMSCI)
+ifeq ($(GUI)$(COM)$(CPUNAME),WNTMSCINTEL)
$(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-x86 \
))
endif
-ifeq ($(GUI)$(COM)$(CPU),WNTGCCI)
+ifeq ($(GUI)$(COM)$(CPUNAME),WNTGCCINTEL)
$(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-mingw \
))
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk
b/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk
index e3d10f8..0c51d10 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk
@@ -42,7 +42,7 @@ ENABLE_EXCEPTIONS=TRUE
# hand coded assembler
CHECKFORPIC=
-.IF "$(COM)$(CPU)" == "C50I" || "$(COM)$(CPU)" == "C52I"
+.IF "$(COM)$(CPUNAME)" == "C50INTEL" || "$(COM)$(CPUNAME)" == "C52INTEL"
CFLAGS += -O5 -xO5
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
b/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
index 13ee9c7..4a22443 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
@@ -42,7 +42,7 @@ ENABLE_EXCEPTIONS=TRUE
# hand coded assembler
CHECKFORPIC=
-.IF "$(COM)" == "C52" && "$(CPU)"=="S"
+.IF "$(COM)" == "C52" && "$(CPUNAME)"=="SPARC"
SLOFILES= \
$(SLO)$/cpp2uno.obj \
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk
b/bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk
index ceea135..2cfe813 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCAIXPgcc3"
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCAIXPOWERPCgcc3" || "$(COM)$(OS)$(CPUNAME)$(COMNAME)"
== "GCCAIXPOWERPC64gcc3"
NOOPTFILES= \
$(SLO)$/uno2cpp.obj \
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk
b/bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk
index 8854280..eec9f9b 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCIOSRgcc3"
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCIOSARMgcc3"
CFLAGSNOOPT=-O0
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
index 02fe524..6859a57 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXL"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXAXP"
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
index f419c3c..13408d0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3" || "$(COM)$(OS)$(CPU)$(COMNAME)" ==
"GCCANDROIDRgcc3"
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCLINUXARMgcc3" || "$(COM)$(OS)$(CPUNAME)$(COMNAME)" ==
"GCCANDROIDARMgcc3"
CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
index f0a2ecd..09d701a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXH"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXHPPA"
CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
index 9405db8..735efd9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXAgcc3"
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCLINUXIA64gcc3"
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
index 10d24a3..a8d59a0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
@@ -38,11 +38,11 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXIgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDIgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCDRAGONFLYIgcc3"
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCLINUXINTELgcc3" || \
+ "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCOPENBSDINTELgcc3" || \
+ "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCFREEBSDINTELgcc3" || \
+ "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCNETBSDINTELgcc3" || \
+ "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCDRAGONFLYINTELgcc3"
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
index 17e343a..83e723c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUX6gcc3"
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCLINUXM68Kgcc3"
CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
index ddb4817..12518a1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXM"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXGODSON"
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
index c563c8e..3ec57c4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCLINUXPgcc3POWERPC"
+.IF "$(COM)$(OS)$(COMNAME)$(CPUNAME)" == "GCCLINUXgcc3POWERPC"
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
index 10e634e..3a3cc0d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCLINUXPgcc3POWERPC64"
+.IF "$(COM)$(OS)$(COMNAME)$(CPUNAME)" == "GCCLINUXgcc3POWERPC64"
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
index f4161e9..b460aff 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCLINUX3gcc3S390"
+.IF "$(COM)$(OS)$(COMNAME)$(CPUNAME)" == "GCCLINUXgcc3S390"
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
index 7e35919..945f6f0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCLINUX3gcc3S390X"
+.IF "$(COM)$(OS)$(COMNAME)$(CPUNAME)" == "GCCLINUXgcc3S390X"
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
index eb12843..4e7800a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXS"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXSPARC"
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# # work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
index acc590b..5e9ae9d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
@@ -38,11 +38,11 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXXgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDXgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDXgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDXgcc3" || \
- "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCDRAGONFLYXgcc3" \
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCLINUXX86_64gcc3" || \
+ "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCOPENBSDX86_64gcc3" || \
+ "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCFREEBSDX86_64gcc3" || \
+ "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCNETBSDX86_64gcc3" || \
+ "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCDRAGONFLYX86_64gcc3" \
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
b/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
index c4fc6df..26297d1 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCMACOSXIgcc3"
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCMACOSXINTELgcc3"
CFLAGSNOOPT=-O0
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk
b/bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk
index 0dc092c..74fc1ca 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCMACOSXPgcc3"
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCMACOSX86_64Pgcc3"
NOOPTFILES= \
$(SLO)$/uno2cpp.obj
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk
b/bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk
index da07803..0e879db 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCSOLARISIgcc3"
+.IF "$(COM)$(OS)$(CPUNAME)$(COMNAME)" == "GCCSOLARISINTELgcc3"
CFLAGSNOOPT=-O0
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/makefile.mk
b/bridges/source/cpp_uno/gcc3_solaris_sparc/makefile.mk
index e268278..bb98dd7 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)" == "GCCSOLARISS"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCSOLARISSPARC"
CFLAGSNOOPT=-O0
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
b/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
index b4608cc..6e11f19 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
+++ b/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
-.IF "$(COM)$(CPU)" == "MSCI"
+.IF "$(COM)$(CPUNAME)" == "MSCINTEL"
.IF "$(debug)" != ""
CFLAGS += -Ob0
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/makefile.mk
b/bridges/source/cpp_uno/msvc_win32_x86-64/makefile.mk
index 7f73ebe..b6e2f07 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/makefile.mk
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
-.IF "$(COM)$(CPU)" == "MSCX"
+.IF "$(COM)$(CPUNAME)" == "MSCX86_64"
.IF "$(debug)" != ""
CFLAGS += -Ob0
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 7f84e3d..9b50996 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -153,7 +153,7 @@ LDFLAGS:=$(cairo_LDFLAGS)
cairo_CFLAGS+=-xc99=none
.ENDIF
-.IF "$(CPU)"=="I"
+.IF "$(CPUNAME)"=="INTEL"
cairo_CFLAGS+=-march=i486
.ENDIF
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 44ea09b..4c883cb 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -117,7 +117,7 @@ LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ld
pixman_CFLAGS+=-xc99=none
.ENDIF
-.IF "$(CPU)"=="I"
+.IF "$(CPUNAME)"=="INTEL"
pixman_CFLAGS+=-march=i486
.ENDIF
diff --git a/connectivity/source/commontools/makefile.mk
b/connectivity/source/commontools/makefile.mk
index 2412538..eaa1651 100755
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
@@ -41,7 +41,7 @@ ENVCFLAGS+=/FR$(SLO)$/
# Disable optimization for SunCC SPARC and MACOSX (funny loops
# when parsing e.g. "x+width/2"),
# also http://gcc.gnu.org/PR22392
-.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" &&
"$(CPU)"=="P")
+.IF ("$(OS)$(CPUNAME)"=="SOLARISSPARC" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" ||
("$(OS)"=="LINUX" && ("$(CPUNAME)"=="POWERPC" || "$(CPUNAME)"=="POWERPC64"))
NOOPTFILES= $(SLO)$/RowFunctionParser.obj
.ENDIF
diff --git a/connectivity/source/drivers/kab/makefile.mk
b/connectivity/source/drivers/kab/makefile.mk
index b3690cc..9c2506e 100755
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS+=$(KDE_CFLAGS)
.IF "$(KDE_ROOT)"!=""
EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib
-.IF "$(OS)$(CPU)" == "LINUXX"
+.IF "$(OS)$(CPUNAME)" == "LINUXX86_64"
EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib64
.ENDIF
.ENDIF
diff --git a/curl/makefile.mk b/curl/makefile.mk
index c7fca54..717fa57 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -135,7 +135,7 @@ EXCFLAGS="/EHsc /YX"
BUILD_DIR=.$/lib
-.IF "$(CPU)" == "I"
+.IF "$(CPUNAME)" == "INTEL"
MACHINE=X86
.ELSE
MACHINE=X64
diff --git a/icu/makefile.mk b/icu/makefile.mk
index cb02475..a959003 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -273,7 +273,7 @@ ICU_BUILD_VERSION=Release
ICU_BUILD_LIBPOST=
.ENDIF
-.IF "$(CPU)" == "I"
+.IF "$(CPUNAME)" == "INTEL"
ICU_BUILD_ARCH=Win32
.ELSE
ICU_BUILD_ARCH=x64
diff --git a/jpeg/jpeg-6b.patch b/jpeg/jpeg-6b.patch
index 1180e7a..f199418 100644
--- a/jpeg/jpeg-6b.patch
+++ b/jpeg/jpeg-6b.patch
@@ -54,7 +54,7 @@
+.INCLUDE : settings.mk
+
+
-+.IF "$(GUI)$(CPU)"=="WNTP"
++.IF "$(GUI)$(CPUNAME)"=="WNTPOWERPC" || "$(GUI)$(CPUNAME)"=="WNTPOWERPC64"
+CFLAGS=$(CFLAGS) -Od
+.ENDIF
+
diff --git a/jpeg/jpeg-8c.patch b/jpeg/jpeg-8c.patch
index 77c1ff5..d13696b 100644
--- a/jpeg/jpeg-8c.patch
+++ b/jpeg/jpeg-8c.patch
@@ -113,7 +113,7 @@
+
+.INCLUDE : settings.mk
+
-+.IF "$(GUI)$(CPU)"=="WNTP"
++.IF "$(GUI)$(CPUNAME)"=="WNTPOWERPC" || "$(GUI)$(CPUNAME)"=="WNTPOWERPC64"
+CFLAGS=$(CFLAGS) -Od
+.ENDIF
+
diff --git a/l10ntools/source/help/makefile.mk b/l10ntools/source/help/makefile.mk
index bab01b8..5af84db 100644
--- a/l10ntools/source/help/makefile.mk
+++ b/l10ntools/source/help/makefile.mk
@@ -62,7 +62,7 @@ EXCEPTIONSFILES=\
$(OBJ)$/HelpCompiler.obj \
$(SLO)$/HelpLinker.obj \
$(SLO)$/HelpCompiler.obj
-.IF "$(OS)" == "MACOSX" && "$(CPU)" == "P" && "$(COM)" == "GCC"
+.IF "$(OS)" == "MACOSX" && ("$(CPUNAME)" == "POWERPC" || "$(CPUNAME)" == "POWERPC64") && "$(COM)"
== "GCC"
# There appears to be a GCC 4.0.1 optimization error causing _file:good() to
# report true right before the call to writeOut at HelpLinker.cxx:1.12 l. 954
# but out.good() to report false right at the start of writeOut at
diff --git a/libpng/libpng-1.5.1.patch b/libpng/libpng-1.5.1.patch
index ebae94a..1aecef4 100644
--- a/libpng/libpng-1.5.1.patch
+++ b/libpng/libpng-1.5.1.patch
@@ -21,7 +21,7 @@
+.INCLUDE : settings.mk
+
+
-+.IF "$(GUI)$(CPU)"=="WNTP"
++.IF "$(GUI)$(CPUNAME)"=="WNTPOWERPC" || "$(GUI)$(CPUNAME)"=="WNTPOWERPC64"
+CFLAGS=$(CFLAGS) -Od
+.ENDIF
+
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index 793c281..6f42670 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-MOZTARGET=$(OS)$(COM)$(CPU)
+MOZTARGET=$(OS)$(COM)$(CPUNAME)
MOZ_DIST_DIR=$(MISC)$/build$/mozilla$/$(BUILD_DIR)$/dist
MOZ_BIN_DIR=$(MOZ_DIST_DIR)$/bin
RUNTIME_DIR=$(MISC)$/$(MOZTARGET)runtime
@@ -39,13 +39,13 @@ INCLUDE_DIR=$(INCCOM)
.IF "$(OS)" == "SOLARIS"
-.IF "$(CPU)" == "S" #32bit
+.IF "$(CPUNAME)" == "SPARC" #32bit
FREEBL_LIB=freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
.ELIF "$(CPU)" == "U" #64bit unxsolu4
FREEBL_LIB=freebl_64int_3 freebl_64fpu_3
.ELSE
FREEBL_LIB=freebl3
-.ENDIF #"$(CPU)" == "S"
+.ENDIF #"$(CPUNAME)" == "SPARC"
.ELSE # "$(OS)" == "SOLARIS"
FREEBL_LIB=freebl3
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 4487bc1..2403ac1 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -181,7 +181,7 @@ MOZILLA_CONFIGURE_FLAGS+= --enable-default-toolkit=$(DEFAULT_MOZILLA_TOOLKIT)
.ENDIF
# create a objdir build = build files in a seperate directory, not in the sourcetree directly
-CONFIGURE_DIR=$(CPU)_objdir
+CONFIGURE_DIR=$(CPUNAME)_objdir
BUILD_DIR=$(CONFIGURE_DIR)
MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch $(MOZ_ARCH)" AR=ar
@@ -222,7 +222,7 @@ ASFLAGS=-m64
.ENDIF
MOZDIR=$(MISC)$/build$/seamonkey
-MOZTARGET=$(OS)$(COM)$(CPU)
+MOZTARGET=$(OS)$(COM)$(CPUNAME)
.IF "$(GUI)"=="WNT"
# "Our" build environment uses "NO" for the environment variable that
@@ -353,8 +353,8 @@ zip: \
$(MISC)$/CREATETARBALL
.IF "$(GUIBASE)"=="aqua" && "$(CREATE_UNIVERSAL_MAC_MOZ_ZIP)"!=""
-MOZ_ARCH=$(eq,$(CPU),I i386 ppc)
-MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8)
+MOZ_ARCH=$(eq,$(CPUNAME),INTEL i386 ppc)
+MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPUNAME),INTEL --target=i386-apple-darwin8
--target=powerpc-apple-darwin8)
force_clean :
@$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your
outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips).
Remember to copy already created zips to a safe place '; exit 1 $(FI)
@@ -366,11 +366,11 @@ zip_ppc .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL
# target-conditionals, when building target -> Macro is set
zip_intel ?= MOZ_ARCH=i386
zip_intel ?= MOZILLA_CONFIGURE_FLAGS+=--target=i386-apple-darwin8
-zip_intel ?= CPU=I
+zip_intel ?= CPUNAME=INTEL
zip_ppc ?= MOZ_ARCH=ppc
zip_ppc ?= MOZILLA_CONFIGURE_FLAGS+=--target=powerpc-apple-darwin8
-zip_ppc ?= CPU=P
+zip_ppc ?= CPUNAME=POWERPC
zip_universal: $(OUT)$/zipped$/$(OS)$(COM)UBinc.zip $(OUT)$/zipped$/$(OS)$(COM)UBlib.zip
$(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip
@echo "All zips created successfully - copy from $(OUT)$/zipped to \$$SRC_ROOT/moz/zipped and
use --disable-build-mozilla to use them"
diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk
index 0f1fe2c..8d45f3f 100644
--- a/moz/zipped/makefile.mk
+++ b/moz/zipped/makefile.mk
@@ -56,27 +56,27 @@ ALLTAR: \
.ENDIF
.IF "$(GUI)" == "UNX"
-$(MISC)$/unpacked_%_lib : $(OS)$(COM)$(CPU)lib.zip '$(OS)$(COM)$(CPU)runtime.zip'
- unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip
&& $(TOUCH) $@
+$(MISC)$/unpacked_%_lib : $(OS)$(COM)$(CPUNAME)lib.zip '$(OS)$(COM)$(CPUNAME)runtime.zip'
+ unzip -o -d $(LB) $(OS)$(COM)$(CPUNAME)lib.zip && unzip -o -d $(LB)
$(OS)$(COM)$(CPUNAME)runtime.zip && $(TOUCH) $@
chmod -R 775 $(LB)
-$(MISC)$/unpacked_%_inc : $(OS)$(COM)$(CPU)inc.zip
- unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@
+$(MISC)$/unpacked_%_inc : $(OS)$(COM)$(CPUNAME)inc.zip
+ unzip -o -d $(INCCOM) $(OS)$(COM)$(CPUNAME)inc.zip && $(TOUCH) $@
chmod -R 775 $(INCCOM)
.ELSE
-$(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip
- unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && \
+$(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPUNAME)lib.zip
+ unzip -o -d $(LB) $(OS)$(COM)$(CPUNAME)lib.zip && \
$(TOUCH) $@
-$(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
- unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@
+$(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPUNAME)inc.zip
+ unzip -o -d $(INCCOM) $(OS)$(COM)$(CPUNAME)inc.zip && $(TOUCH) $@
.ENDIF
-$(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip
- $(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
+$(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPUNAME)runtime.zip
+ $(COPY) $(OS)$(COM)$(CPUNAME)runtime.zip $(BIN)$/mozruntime.zip
# add alternative rules for universal binary moz-zips
.IF "$(GUIBASE)" == "aqua"
@@ -158,13 +158,13 @@ NSS_INCLUDE_LIST=
.IF "$(OS)" == "SOLARIS"
-.IF "$(CPU)" == "S" #32bit
+.IF "$(CPUNAME)" == "SPARC" #32bit
FREEBL=freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
.ELIF "$(CPU)" == "U" #64bit unxsolu4
FREEBL=freebl_64int_3 freebl_64fpu_3
.ELSE
FREEBL=freebl3
-.ENDIF #"$(CPU)" == "S"
+.ENDIF #"$(CPUNAME)" == "SPARC"
.ELSE # "$(OS)" == "SOLARIS"
FREEBL=freebl3
diff --git a/nss/makefile.mk b/nss/makefile.mk
index bc7b827..ad1f6b6 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -70,15 +70,15 @@ CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(OUTDIR) --includedir=$(OUT
# force 64-bit buildmode
USE_64:=1
.EXPORT : USE_64
-.ENDIF # "$(CPU)"=="X"
+.ENDIF # "$(CPUNAME)"=="X86_64"
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="FREEBSDGCC"
-.IF "$(CPU)"=="X"
+.IF "$(CPUNAME)"=="X86_64"
# force 64-bit buildmode
USE_64:=1
.EXPORT : USE_64
-.ENDIF # "$(CPU)"=="X"
+.ENDIF # "$(CPUNAME)"=="X86_64"
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)"=="MACOSX"
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 583f33a..3ffb45c 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -114,7 +114,7 @@ MY_DLLPOSTFIX=.so
MY_DLLOUT=$(OUT)/lib
DLLOUT=$(SOLARLIBDIR)
-.IF "$(OS)$(CPU)"=="SOLARISS"
+.IF "$(OS)$(CPUNAME)"=="SOLARISSPARC"
# SOLARIS SPARC
DESTPLATFROM=solsparc
@@ -122,7 +122,7 @@ DESTPLATFROM=solsparc
# SOLARIS SPARC 64
DESTPLATFROM=solsparc64
-.ELIF "$(OS)$(CPU)"=="SOLARISI"
+.ELIF "$(OS)$(CPUNAME)"=="SOLARISINTEL"
# SOLARIS INTEL
DESTPLATFROM=solintel
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index f537838..70bc3bc 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -77,7 +77,7 @@ UNAME=$(shell uname)
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8o.map \
libssl_OOo_0_9_8o.map
- .IF "$(CPU)" == "I"
+ .IF "$(CPUNAME)" == "INTEL"
.IF "$(UNAME)" == "GNU/kFreeBSD"
CONFIGURE_ACTION=Configure debian-kfreebsd-i386
.ELSE
@@ -106,7 +106,7 @@ UNAME=$(shell uname)
# Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
.IF "$(CPUNAME)" == "INTEL" # Solaris INTEL
- .IF "$(CPU)" == "X"
+ .IF "$(CPUNAME)" == "X86_64"
CONFIGURE_ACTION=Configure solaris64-x86_64-cc
.ELSE
CONFIGURE_ACTION=Configure solaris-x86-cc
@@ -155,7 +155,7 @@ OUT2BIN += libeay32.dll
#CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure
CONFIGURE_ACTION=$(PERL) configure
-.IF "$(CPU)" == "I"
+.IF "$(CPUNAME)" == "INTEL"
OPENSSL_PLATFORM=VC-WIN32
.ELSE
OPENSSL_PLATFORM=VC-WIN64A
diff --git a/postgresql/postgresql-9.1.1-libreoffice.patch
b/postgresql/postgresql-9.1.1-libreoffice.patch
index d3ba124a..492e08d 100644
--- a/postgresql/postgresql-9.1.1-libreoffice.patch
+++ b/postgresql/postgresql-9.1.1-libreoffice.patch
@@ -17,12 +17,12 @@ diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak m
-!IF ("$(CPU)" == "")||("$(CPU)" == "i386")
-CPU=i386
-+!IF ("$(CPU)" == "")||("$(CPU)" == "I")
++!IF ("$(CPUNAME)" == "")||("$(CPUNAME)" == "INTEL")
+MACHINE=i386
!MESSAGE Building the Win32 static library...
!MESSAGE
-!ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64")
-+!ELSEIF ("$(CPU)" == "X")
++!ELSEIF ("$(CPUNAME)" == "X86_64")
+MACHINE=AMD64
ADD_DEFINES=/D "WIN64" /Wp64 /GS
ADD_SECLIB=bufferoverflowU.lib
@@ -31,7 +31,7 @@ diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak m
!ELSE
!MESSAGE Please check a CPU=$(CPU) ?
-!MESSAGE CPU=i386 or AMD64 or IA64
-+!MESSAGE CPU=I or X
++!MESSAGE CPUNAME=INTEL or X86_64
!ERROR Make aborted.
!ENDIF
diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk
index a6a2eb9..c5d7615 100644
--- a/postprocess/rebase/makefile.mk
+++ b/postprocess/rebase/makefile.mk
@@ -44,7 +44,7 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll
ALLTAR : REBASE
REBASE .PHONY : $(BASEADDRESSES)
-.IF "$(GUI)$(COM)$(CPU)"=="WNTMSCI"
+.IF "$(GUI)$(COM)$(CPUNAME)"=="WNTMSCINTEL"
.IF "$(product)"=="full"
$(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC)
-v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES)
.ELSE # "$(product)"=="full"
diff --git a/python/makefile.mk b/python/makefile.mk
index 4f50ed3..da4c954 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -85,14 +85,14 @@ python_CFLAGS=-g0
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=/python-inst --enable-shared
CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)"
-.IF "$(OS)$(CPU)" == "SOLARISI"
+.IF "$(OS)$(CPUNAME)" == "SOLARISINTEL"
CONFIGURE_ACTION += --disable-ipv6
.ENDIF
.IF "$(OS)" == "MACOSX"
PATCH_FILES+=Python-2.6.1-py8067.patch Python-2.6.1-dylib_dynload.patch
# don't build dual-arch version as OOo itself is not universal binary either
-PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch
+PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPUNAME),INTEL i386 ppc).patch
CONFIGURE_ACTION+=--enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit
--enable-framework=/python-inst --with-framework-name=OOoPython
ALLTAR: $(MISC)/OOoPython.framework.zip
@@ -134,7 +134,7 @@ BUILD_DIR=PC/VS7.1
BUILD_DIR=PC/VC6
.ENDIF
-.IF "$(CPU)" == "I"
+.IF "$(CPUNAME)" == "INTEL"
ARCH=Win32
.ELSE
ARCH=x64
diff --git a/reportbuilder/util/makefile.pmk b/reportbuilder/util/makefile.pmk
index 5661322..7e2b2dc 100644
--- a/reportbuilder/util/makefile.pmk
+++ b/reportbuilder/util/makefile.pmk
@@ -59,7 +59,7 @@ LOCALIDLFILES=TRUE
URDDOC=TRUE
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
-.IF "$(CPU)"=="I"
+.IF "$(CPUNAME)"=="INTEL"
UNOIDL=unoidl
.ENDIF
.ENDIF
diff --git a/salhelper/test/rtti/makefile.mk b/salhelper/test/rtti/makefile.mk
index 704454f..26edbe3 100644
--- a/salhelper/test/rtti/makefile.mk
+++ b/salhelper/test/rtti/makefile.mk
@@ -71,13 +71,13 @@ DEF1EXPORTFILE= exports.dxp
DEF1NAME= $(SHL1TARGET)
-.IF "$(OS)$(CPU)"=="SOLARISS"
+.IF "$(OS)$(CPUNAME)"=="SOLARISSPARC"
SHL1VERSIONMAP= sols.map
-.ELIF "$(OS)$(CPU)"=="LINUXI"
+.ELIF "$(OS)$(CPUNAME)"=="LINUXINTEL"
SHL1VERSIONMAP= lngi.map
-.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2"
+.ELIF "$(OS)$(CPUNAME)$(COMNAME)" == "GCCFREEBSDINTELgcc2"
SHL1VERSIONMAP= gcc2_freebsd_intel.map
-.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
+.ELIF "$(OS)$(CPUNAME)$(COMNAME)" == "GCCFREEBSDINTELgcc3"
SHL1VERSIONMAP= gcc3_freebsd_intel.map
.ENDIF
diff --git a/set_soenv.in b/set_soenv.in
index 06c8b30..2240f37 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -49,7 +49,7 @@ my ( $SOLAR_JAVA,
$CC, $CXX);
#
# Platform dependent constant values.
-my ( $COM, $ARCH, $CPU, $CPUNAME, $GUI, $GUIBASE,
+my ( $COM, $ARCH, $CPUNAME, $GUI, $GUIBASE,
$OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
$DYNAMIC_CRT, $use_shl_versions, $JRELIBDIR,
$JRETOOLKITDIR, $JRETHREADDIR );
@@ -173,7 +173,6 @@ if ( $platform =~ m/solaris/ )
} else {
$OUTPATH = "unxsoli4";
}
- $CPU = "I";
$CPUNAME = "INTEL";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
@@ -187,7 +186,6 @@ if ( $platform =~ m/solaris/ )
} else {
$OUTPATH = "unxsols4";
}
- $CPU = "S";
$CPUNAME = "SPARC";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
@@ -207,7 +205,6 @@ elsif ( $platform =~ m/netbsd/ )
#Set platform specific values:
if ($platform =~ m/^i[3456]86/)
{ print "Setting NetBSD x86 specific values... ";
- $CPU = "I";
$CPUNAME = "INTEL";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
@@ -215,7 +212,6 @@ elsif ( $platform =~ m/netbsd/ )
}
elsif ($platform =~ m/^x86_64/)
{ print "Setting NetBSD x86-64 specific values... ";
- $CPU = "X";
$CPUNAME = "X86_64";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."client";
@@ -223,7 +219,6 @@ elsif ( $platform =~ m/netbsd/ )
}
elsif ($platform =~ m/^sparc/)
{ print "Setting NetBSD Sparc specific values... ";
- $CPU = "S";
$CPUNAME = "SPARC";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
@@ -231,7 +226,6 @@ elsif ( $platform =~ m/netbsd/ )
}
elsif ($platform =~ m/powerpc/)
{ print "Setting NetBSD PPC specific values... ";
- $CPU = "P";
$CPUNAME = "POWERPC";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
@@ -264,7 +258,6 @@ elsif ( $platform =~ m/kfreebsd/ )
#Set platform specific values:
if ($platform =~ m/^i[3456]86/)
{ print "Setting GNU/kFreeBSD x86 specific values... ";
- $CPU = "I";
$CPUNAME = "INTEL";
$OUTPATH = "unxkfgi6";
@@ -275,7 +268,6 @@ elsif ( $platform =~ m/kfreebsd/ )
}
elsif ($platform =~ m/^x86_64/)
{ print "Setting GNU/kFreeBSD x86-64 specific values... ";
- $CPU = "X";
$CPUNAME = "X86_64";
$OUTPATH = "unxkfgx6";
@@ -298,7 +290,6 @@ elsif ( $platform =~ m/freebsd/ )
if ($platform =~ m/^(amd64|x86_64)/)
{ my ( $JAVA_OS );
print "Setting FreeBSD AMD64 specific values... ";
- $CPU = "X";
$CPUNAME = "X86_64";
$JAVA_OS = '@JAVA_HOME@';
$JAVA_OS =~ s/.*\///;
@@ -315,7 +306,6 @@ elsif ( $platform =~ m/freebsd/ )
}
elsif ($platform =~ m/^i386/)
{ print "Setting FreeBSD x86 specific values... ";
- $CPU = "I";
$CPUNAME = "INTEL";
$OUTPATH = "unxfbsdi";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
@@ -340,7 +330,6 @@ elsif ( $platform =~ m/openbsd/ )
if ($platform =~ m/^(amd64|x86_64)/)
{
print "Setting OpenBSD AMD64 specific values... ";
- $CPU = "X";
$CPUNAME = "X86_64";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
@@ -348,7 +337,6 @@ elsif ( $platform =~ m/openbsd/ )
}
elsif ($platform =~ m/^i386/)
{ print "Setting OpenBSD x86 specific values... ";
- $CPU = "I";
$CPUNAME = "INTEL";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
@@ -373,7 +361,6 @@ elsif ( $platform =~ m/linux/ )
#Set platform specific values:
if ($platform =~ m/^i[3456]86/)
{ print "Setting Linux x86 specific values... ";
- $CPU = "I";
$CPUNAME = "INTEL";
if ($JDK =~ m/^[Ii][Bb][Mm]/)
@@ -397,7 +384,6 @@ elsif ( $platform =~ m/linux/ )
}
elsif ($platform =~ m/^x86_64/)
{ print "Setting Linux x86-64 specific values... ";
- $CPU = "X";
$CPUNAME = "X86_64";
$OUTPATH = "unxlngx6";
# Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
@@ -408,7 +394,6 @@ elsif ( $platform =~ m/linux/ )
}
elsif ($platform =~ m/^ia64/)
{ print "Setting Linux ia64 specific values... ";
- $CPU = "A";
$CPUNAME = "IA64";
$OUTPATH = "unxlnga";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64";
@@ -418,7 +403,6 @@ elsif ( $platform =~ m/linux/ )
elsif ($platform =~ m/^sparc/)
{ print "Setting Linux Sparc specific values... ";
- $CPU = "S";
$CPUNAME = "SPARC";
$OUTPATH = "unxlngs";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc";
@@ -466,7 +450,6 @@ elsif ( $platform =~ m/linux/ )
}
}
- $CPU = "P";
}
elsif ($platform =~ m/^s390/)
@@ -486,11 +469,9 @@ elsif ( $platform =~ m/linux/ )
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH;
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
$JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
- $CPU = "3";
}
elsif ($platform =~ m/^m68k/)
{ print "Setting Linux m68k specific values... ";
- $CPU = "6";
$CPUNAME = "M68K";
$OUTPATH = "unxlngm68k";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k";
@@ -499,7 +480,6 @@ elsif ( $platform =~ m/linux/ )
}
elsif ($platform =~ m/^hppa/)
{ print "Setting Linux hppa specific values... ";
- $CPU = "H";
$CPUNAME = "HPPA";
$OUTPATH = "unxlnghppa";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa";
@@ -509,7 +489,6 @@ elsif ( $platform =~ m/linux/ )
}
elsif ($platform =~ m/^alpha/)
{ print "Setting Linux Alpha specific values... ";
- $CPU = "L";
$CPUNAME = "AXP";
$OUTPATH = "unxlngaxp";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha";
@@ -518,7 +497,6 @@ elsif ( $platform =~ m/linux/ )
}
elsif ($platform =~ m/^arm.*?l-/)
{ print "Setting Linux ARM specific values... ";
- $CPU = "R";
$CPUNAME = "ARM";
$OUTPATH = "unxlngr";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm";
@@ -530,7 +508,6 @@ elsif ( $platform =~ m/linux/ )
{ print "Setting Android ARM specific values... ";
$GUIBASE = "android";
$OS = "ANDROID";
- $CPU = "R";
$CPUNAME = "ARM";
$OUTPATH = "unxandr";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm";
@@ -540,7 +517,6 @@ elsif ( $platform =~ m/linux/ )
}
elsif ($platform =~ m/^mips/)
{ print "Setting Linux MIPS specific values... ";
- $CPU = "M";
$CPUNAME = "GODSON";
$OUTPATH = "unxlngmips";
@@ -593,8 +569,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
$DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
$CPUNAME = "INTEL";
$CPUNAME = "X86_64" if $CL_X64;
- $CPU = "I";
- $CPU = "X" if $CL_X64;
$GUI = "WNT";
$GUIBASE = "WIN";
$OS = "WNT";
@@ -647,7 +621,6 @@ elsif ( $platform =~ m/darwin/ )
if ($platform =~ m/^arm/)
{
print "Setting values for iOS... ";
- $CPU = "R";
$CPUNAME = "ARM";
$OUTPATH = "unxiosr";
$GUI = "UNX";
@@ -657,7 +630,6 @@ elsif ( $platform =~ m/darwin/ )
elsif ($platform =~ m/^powerpc/)
{
print "Setting values for Mac OS X/Darwin on PowerPC... ";
- $CPU = "P";
$CPUNAME = "POWERPC";
$OUTPATH = "unxmacxp";
$OS = "MACOSX";
@@ -669,7 +641,6 @@ elsif ( $platform =~ m/darwin/ )
else
{
print "Setting values for Mac OS X/Darwin on default x86... ";
- $CPU = "I";
$CPUNAME = "INTEL";
$OUTPATH = "unxmacxi";
$OS = "MACOSX";
@@ -685,7 +656,6 @@ elsif ( $platform =~ m/dragonfly/ )
{
if ($platform =~ m/^i386/)
{ print "Setting DragonFly i386 specific values... ";
- $CPU = "I";
$CPUNAME = "INTEL";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
@@ -693,7 +663,6 @@ elsif ( $platform =~ m/dragonfly/ )
}
elsif ($platform =~ m/^x86_64/)
{ print "Setting DragonFly x86-64 specific values... ";
- $CPU = "X";
$CPUNAME = "X86_64";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
$JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
@@ -716,7 +685,6 @@ elsif ( $platform =~ m/dragonfly/ )
elsif ( $platform =~ m/aix/ )
{
print "Setting AIX PPC specific values... ";
- $CPU = "P";
$CPUNAME = "POWERPC";
$OUTPATH = "unxaigppc";
$JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
@@ -758,13 +726,13 @@ if ($platform =~ m/cygwin/)
# and we're also not using the external system mozilla installation.
#
# FIXME! This check should be done in configure and not here, but
-# the $OS, $COM, $CPU variables are not yet present there.
+# the $OS, $COM, $CPUNAME variables are not yet present there.
#
if ( "@WITH_MOZILLA@" eq "YES" and "@BUILD_MOZAB@" ne "TRUE" and "@SYSTEM_MOZILLA@" ne "YES" )
{
print("Checking for prebuilt Mozilla libraries ...");
my $mozbinfile = $SRC_ROOT."/moz/zipped/";
- $mozbinfile .= $OS.$COM.$CPU;
+ $mozbinfile .= $OS.$COM.$CPUNAME;
if ( -e $mozbinfile."inc.zip"
and -e $mozbinfile."lib.zip"
and -e $mozbinfile."runtime.zip" )
@@ -775,7 +743,7 @@ if ( "@WITH_MOZILLA@" eq "YES" and "@BUILD_MOZAB@" ne "TRUE" and "@SYSTEM_MOZILL
{ print " not found!\n\n";
print "If you don\'t use the system mozilla and also not build the needed\n";
print "mozilla libraries yourself you have to provide the needed files\n";
- print "$OS$COM$CPU\{inc,lib,runtime\}.zip in moz/zipped/ .\n";
+ print "$OS$COM$CPUNAME\{inc,lib,runtime\}.zip in moz/zipped/ .\n";
print "These files can be found here:\n";
print " <http://dev-www.libreoffice.org/mozilla/>.\n\n";
die;
@@ -1492,7 +1460,6 @@ ToFile( "Platform dependent constant values.", $empty, "c" );
ToFile( "SOLAR_JAVA", $SOLAR_JAVA, "e" );
ToFile( "COM", $COM, "e" );
ToFile( "COMPATH", $COMPATH, "e" );
-ToFile( "CPU", $CPU, "e" );
ToFile( "CPUNAME", $CPUNAME, "e" );
ToFile( "GUI", $GUI, "e" );
ToFile( "GUIBASE", $GUIBASE, "e" );
@@ -1653,7 +1620,6 @@ if ( '@CROSS_COMPILING@' eq 'YES' )
ToFile( "GUI_FOR_BUILD", "@GUI_FOR_BUILD@", "e" );
ToFile( "GUIBASE_FOR_BUILD", "@GUIBASE_FOR_BUILD@", "e" );
ToFile( "OS_FOR_BUILD", "@OS_FOR_BUILD@", "e" );
- ToFile( "CPU_FOR_BUILD", "@CPU_FOR_BUILD@", "e" );
ToFile( "CPUNAME_FOR_BUILD", "@CPUNAME_FOR_BUILD@", "e" );
ToFile( "CC_FOR_BUILD", "@CC_FOR_BUILD@", "e" );
ToFile( "CXX_FOR_BUILD", "@CXX_FOR_BUILD@", "e" );
@@ -1673,7 +1639,6 @@ else
ToFile( "GUI_FOR_BUILD", $GUI, "e" );
ToFile( "GUIBASE_FOR_BUILD", $GUIBASE, "e" );
ToFile( "OS_FOR_BUILD", $OS, "e" );
- ToFile( "CPU_FOR_BUILD", $CPU, "e" );
ToFile( "CPUNAME_FOR_BUILD", $CPUNAME, "e" );
ToFile( "CC_FOR_BUILD", $CC, "e" );
ToFile( "CXX_FOR_BUILD", $CXX, "e" );
diff --git a/setup_native/scripts/source/makefile.mk b/setup_native/scripts/source/makefile.mk
index 6933f53..60c84e8 100644
--- a/setup_native/scripts/source/makefile.mk
+++ b/setup_native/scripts/source/makefile.mk
@@ -53,7 +53,7 @@ CFLAGS+=-D_GNU_SOURCE
.ENDIF
.IF "$(OS)" == "SOLARIS"
-.IF "$(CPU)" == "I"
+.IF "$(CPUNAME)" == "INTEL"
.IF "$(COM)" != "GCC"
CFLAGS+=-D_KERNEL
.ENDIF
@@ -65,7 +65,7 @@ CFLAGS+=-D_KERNEL
# 64 bit builds
.IF "$(OS)" == "SOLARIS"
.IF "$(COM)" != "GCC"
-.IF "$(CPU)" == "S"
+.IF "$(CPUNAME)" == "SPARC"
ENVCFLAGS=-xarch=v8
.ENDIF
.IF "$(CPU)"=="U"
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 2eb256d..8de4773 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -63,7 +63,7 @@ CCNUMVER:=$(shell @-$(CXX) $(CFLAGSNUMVERSION_CMD))
.IF "$(COM)"=="MSC"
COMID=MSC
-.IF "$(CPU)"=="I"
+.IF "$(CPUNAME)"=="INTEL"
COMNAME=msci
.ELSE
COMNAME=mscx
@@ -98,7 +98,7 @@ SHORTSTDCPP3="5"
.ENDIF
.IF "$(CCNUMVER)">="000300040000"
-.IF "$(OS)$(CPU)" == "LINUX6" || "$(OS)$(CPU)" == "LINUXH"
+.IF "$(OS)$(CPUNAME)" == "LINUXM68K" || "$(OS)$(CPUNAME)" == "LINUXHPPA"
#for gcc >= 3.4.0 on m68k-linux this is libgcc_s.so.2.
#for gcc >= 3.4.0 < 4.2.0 on hppa-linux this is libgcc_s.so.2.
SHORTSTDC3:="2"
@@ -107,7 +107,7 @@ SHORTSTDCPP3="6"
.ENDIF
.IF "$(CCNUMVER)">="000400020000"
-.IF "$(OS)$(CPU)" == "LINUXH"
+.IF "$(OS)$(CPUNAME)" == "LINUXHPPA"
#for gcc >= 4.2.0 on hppa-linux this is libgcc_s.so.4.
SHORTSTDC3:="4"
.ENDIF
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index df39ba652..2d7d7a3 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -76,7 +76,7 @@ ZIPJAR_EXCLUDE=$(foreach,i,$(JARCLASSEXCLUDES) -x "$i")
#
$(JARTARGETN) .PHONY :
# $(JARMANIFEST)
-.IF "$(OS)$(CPU)"=="SOLARISS"
+.IF "$(OS)$(CPUNAME)"=="SOLARISSPARC"
@-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1
.ENDIF
.IF "$(JARMANIFEST)"!=""
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
index 9893950..d09890a 100644
--- a/solenv/inc/tg_java.mk
+++ b/solenv/inc/tg_java.mk
@@ -71,7 +71,7 @@ $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES)
.ENDIF # "$(javauno)"!=""
.ENDIF # "$(use_jdep)"!=""
.ENDIF # "$(JAVARESPONSE)"!=""
-.IF "$(OS)$(CPU)"=="SOLARISS"
+.IF "$(OS)$(CPUNAME)"=="SOLARISSPARC"
@@-find $(CLASSDIR) -type d -user $(USER) \! -perm -5 -print | xargs chmod a+r $$1
.ENDIF
@$(TOUCH) $@
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 3093d58..341aa77 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -35,11 +35,11 @@
# --- Compiler ---
-.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISS4"
+.IF "$(OS)$(CPUNAME)$(COMEX)" == "SOLARISSPARC4"
.INCLUDE : unxsols4.mk
.ENDIF
-.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISI4"
+.IF "$(OS)$(CPUNAME)$(COMEX)" == "SOLARISINTEL4"
.INCLUDE : unxsoli4.mk
.ENDIF
@@ -47,55 +47,55 @@
.INCLUDE : unxsolu4.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCSOLARISS"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCSOLARISSPARC"
.INCLUDE : unxsogs.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCSOLARISI"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCSOLARISINTEL"
.INCLUDE : unxsogi.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXS"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXSPARC"
.INCLUDE : unxlngs.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXI"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXINTEL"
.INCLUDE : unxlngi.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXX"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXX86_64"
.INCLUDE : unxlngx.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXPOWERPC"
.INCLUDE : unxlngppc.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC64"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXPOWERPC64"
.INCLUDE : unxlngppc64.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCAIXP"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCAIXPOWERPC"
.INCLUDE : unxaigppc.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXS390"
.INCLUDE : unxlngs390.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390X"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXS390X"
.INCLUDE : unxlngs390x.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXR"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXARM"
.INCLUDE : unxlngr.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCANDROIDR"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCANDROIDARM"
.INCLUDE : unxandr.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXIA64"
.INCLUDE : unxlnga.mk
.ENDIF
@@ -115,31 +115,31 @@
.INCLUDE : unxdfly.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCMACOSXPOWERPC"
.INCLUDE : unxmacxp.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXI"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCMACOSXINTEL"
.INCLUDE : unxmacxi.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCIOSR"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCIOSARM"
.INCLUDE : unxiosr.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXM"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXGODSON"
.INCLUDE : unxlngmips.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUX6"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXM68K"
.INCLUDE : unxlngm68k.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXH"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXHPPA"
.INCLUDE : unxlnghppa.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXL"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXAXP"
.INCLUDE : unxlngaxp.mk
.ENDIF
@@ -173,9 +173,9 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR)
KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE
KDE_LIBS:=-lkdeui -lkdecore -lqt-mt
SOLARLIB+=-L$(KDE_ROOT)/lib
-.IF "$(OS)$(CPU)" == "LINUXX"
+.IF "$(OS)$(CPUNAME)" == "LINUXX86_64"
SOLARLIB+=-L$(KDE_ROOT)/lib64
-.ENDIF # "$(OS)$(CPU)" == "LINUXX"
+.ENDIF # "$(OS)$(CPUNAME)" == "LINUXX86_64"
.ENDIF # "$(KDE_ROOT)"!=""
.ENDIF # "$(ENABLE_KDE)" != ""
@@ -183,4 +183,4 @@ SOLARLIB+=-L$(KDE_ROOT)/lib64
OOO_LIBRARY_PATH_VAR *= DYLD_LIBRARY_PATH
.ELSE
OOO_LIBRARY_PATH_VAR *= LD_LIBRARY_PATH
-.ENDIF
\ No newline at end of file
+.ENDIF
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index dd3e0c8..cf129e1 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -36,7 +36,7 @@
.INCLUDE : wntmsc.mk
.ENDIF # "$(OS)$(COM)" == "WNTMSC"
-.IF "$(COM)$(OS)$(CPU)" == "GCCWNTI"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCWNTINTEL"
.INCLUDE : wntgcci.mk
.ENDIF
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index f7b2dbe..705e7e2 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13}
+# mk file for $(OS)$(COM)$(CPUNAME)$(COMEX) == WNTMSC{INTEL,X86_64}{12,13}
JAVAFLAGSDEBUG=-g
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 1423190..9d73767 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -146,7 +146,7 @@ ALLTAR: \
runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
$(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
.IF "$(CROSS_COMPILING)"!="YES"
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
+.IF "$(COM)$(OS)$(CPUNAME)" == "GCCMACOSXPOWERPC" || "$(COM)$(OS)$(CPUNAME)" ==
"GCCMACOSXPOWERPC64"
@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
.ELSE
cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 85c2a88..2c4b38e 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -68,7 +68,7 @@ CXXFLAGS+:=$(EXTRA_CDEFS)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="SOLARIS"
CFLAGS:=-O $(ARCH_FLAGS)
-.IF "$(COM)$(CPU)" == "C52I"
+.IF "$(COM)$(CPUNAME)" == "C52INTEL"
CXXFLAGS:=-O2 $(ARCH_FLAGS)
.ELSE
CXXFLAGS:=-O $(ARCH_FLAGS)
@@ -83,7 +83,7 @@ LDFLAGS:=$(ARCH_FLAGS)
CONFIGURE_ACTION=configure
CONFIGURE_FLAGS+=--without-x --without-libpaper-library --without-t1-library
--enable-multithreaded --enable-exceptions
-.IF "$(OS)$(CPU)"=="MACOSXP"
+.IF "$(OS)$(CPUNAME)"=="MACOSXPOWERPC" || "$(OS)$(CPUNAME)"=="MACOSXPOWERPC64"
CXXFLAGS+=-malign-natural
.EXPORT: CXXFLAGS
.ENDIF
Context
- [Libreoffice] [PATCH] Fix fdo#42783 get rid of CPU define/build system variable · Victor Lee
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.