From 3551d7cc58aa22638d63d6138f9ed04aa6aeeb68 Mon Sep 17 00:00:00 2001 From: Thomas Collerton Date: Sat, 25 Feb 2012 12:03:55 +0100 Subject: [PATCH] EasyHack 42783: get rid of CPU define/build system variable --- basic/Library_sb.mk | 8 ++-- .../source/cpp_uno/cc50_solaris_intel/makefile.mk | 2 +- .../source/cpp_uno/cc50_solaris_sparc/makefile.mk | 2 +- .../source/cpp_uno/gcc3_aix_powerpc/makefile.mk | 2 +- bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk | 2 +- .../source/cpp_uno/gcc3_linux_alpha/makefile.mk | 2 +- bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk | 2 +- bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk | 2 +- bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk | 2 +- .../source/cpp_uno/gcc3_linux_intel/makefile.mk | 10 ++-- bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk | 2 +- bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk | 2 +- .../source/cpp_uno/gcc3_linux_powerpc/makefile.mk | 2 +- .../cpp_uno/gcc3_linux_powerpc64/makefile.mk | 2 +- bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk | 2 +- .../source/cpp_uno/gcc3_linux_s390x/makefile.mk | 2 +- .../source/cpp_uno/gcc3_linux_sparc/makefile.mk | 2 +- .../source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 10 ++-- .../source/cpp_uno/gcc3_macosx_intel/makefile.mk | 2 +- .../source/cpp_uno/gcc3_macosx_powerpc/makefile.mk | 2 +- .../source/cpp_uno/gcc3_solaris_intel/makefile.mk | 2 +- .../source/cpp_uno/gcc3_solaris_sparc/makefile.mk | 2 +- .../source/cpp_uno/msvc_win32_intel/makefile.mk | 2 +- .../source/cpp_uno/msvc_win32_x86-64/makefile.mk | 2 +- cairo/cairo/makefile.mk | 2 +- cairo/pixman/makefile.mk | 2 +- configure.in | 4 +- connectivity/source/commontools/makefile.mk | 3 +- connectivity/source/drivers/kab/makefile.mk | 2 +- curl/makefile.mk | 2 +- icu/makefile.mk | 2 +- jpeg/jpeg-6b.patch | 2 +- jpeg/jpeg-8c.patch | 2 +- l10ntools/source/help/makefile.mk | 2 +- libpng/libpng-1.5.1.patch | 2 +- nss/makefile.mk | 6 +-- odk/util/makefile.pmk | 4 +- openssl/makefile.mk | 6 +-- postprocess/rebase/makefile.mk | 2 +- python/makefile.mk | 4 +- reportbuilder/util/makefile.pmk | 2 +- sal/Library_sal.mk | 4 +- salhelper/test/rtti/makefile.mk | 2 +- setup_native/scripts/source/makefile.mk | 4 +- solenv/inc/tg_compv.mk | 6 +-- solenv/inc/tg_jar.mk | 2 +- solenv/inc/tg_java.mk | 2 +- solenv/inc/unx.mk | 50 ++++++++++---------- solenv/inc/wnt.mk | 2 +- solenv/inc/wntmsc.mk | 2 +- testtools/source/bridgetest/makefile.mk | 2 +- xpdf/makefile.mk | 4 +- 52 files changed, 100 insertions(+), 99 deletions(-) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 0171682..060849e 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -150,12 +150,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 \ )) @@ -165,12 +165,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..ea5aa02 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" 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..733e452 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)$(CPUNAME)$(COMNAME)" == "GCCLINUXPOWERPCgcc3" # 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..2d04c0d 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)$(CPUNAME)$(COMNAME)" == "GCCLINUXPOWERPC64gcc3" # 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..563bbc9 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)$(CPUNAME)$(COMNAME)" == "GCCLINUXS390gcc3" # 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..c714ee2 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)$(CPUNAME)$(COMNAME)" == "GCCLINUXS390Xgcc3" # 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..840222c 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)" == "GCCMACOSXPOWERPCgcc3" 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 8f2a359..9dd0362 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -156,7 +156,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/configure.in b/configure.in index 3b27ac8..da117ee 100644 --- a/configure.in +++ b/configure.in @@ -2760,8 +2760,8 @@ darwin*) ;; powerpc*) CPU=P - CPUNAME="POWERPC" - OUTPATH="unxmacxp" + CPUNAME=POWERPC + OUTPATH=unxmacxp ;; i*86|x86_64) CPU=I diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk index 686f6d6..93ec66d 100755 --- a/connectivity/source/commontools/makefile.mk +++ b/connectivity/source/commontools/makefile.mk @@ -41,7 +41,8 @@ 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 c7f7b9a..54b2e41 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 872544c..428df85 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -274,7 +274,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..491d521 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" +CFLAGS=$(CFLAGS) -Od +.ENDIF + diff --git a/jpeg/jpeg-8c.patch b/jpeg/jpeg-8c.patch index 77c1ff5..6fa3c68 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" +CFLAGS=$(CFLAGS) -Od +.ENDIF + diff --git a/l10ntools/source/help/makefile.mk b/l10ntools/source/help/makefile.mk index 2b7cdf3..631f803 100644 --- a/l10ntools/source/help/makefile.mk +++ b/l10ntools/source/help/makefile.mk @@ -67,7 +67,7 @@ SLOFILES=\ $(SLO)$/HelpIndexer.obj \ $(SLO)$/HelpSearch.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..680460c 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" +CFLAGS=$(CFLAGS) -Od +.ENDIF + diff --git a/nss/makefile.mk b/nss/makefile.mk index 744f944..ab53d55 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 dcbf04e..70f5d0a 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -82,7 +82,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 @@ -111,7 +111,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 @@ -160,7 +160,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/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 be7fcbb..07db6f4 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -85,7 +85,7 @@ 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 @@ -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/sal/Library_sal.mk b/sal/Library_sal.mk index 60ab9c9..4597acb 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -191,7 +191,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/unx/osxlocale \ )) endif -ifneq ($(filter $(OS),SOLARIS FREEBSD NETBSD MACOSX AIX OPENBSD DRAGONFLY)$(filter $(OS)$(CPU),LINUXS),) +ifneq ($(filter $(OS),SOLARIS FREEBSD NETBSD MACOSX AIX OPENBSD DRAGONFLY)$(filter $(OS)$(CPUNAME),LINUXSPARC),) $(eval $(call gb_Library_add_cobjects,sal,\ sal/osl/unx/backtrace \ )) @@ -200,7 +200,7 @@ ifneq ($(filter $(OS)$(CPU),SOLARISU SOLARISS NETBSDS LINUXS),) $(eval $(call gb_Library_add_asmobjects,sal,\ sal/osl/unx/asm/interlck_sparc \ )) -else ifeq ($(OS)$(CPU),SOLARISI) +else ifeq ($(OS)$(CPUNAME),SOLARISINTEL) $(eval $(call gb_Library_add_asmobjects,sal,\ sal/osl/unx/asm/interlck_x86 \ )) diff --git a/salhelper/test/rtti/makefile.mk b/salhelper/test/rtti/makefile.mk index e87182c..9ee8a88 100644 --- a/salhelper/test/rtti/makefile.mk +++ b/salhelper/test/rtti/makefile.mk @@ -71,7 +71,7 @@ DEF1EXPORTFILE= exports.dxp DEF1NAME= $(SHL1TARGET) -.IF "$(OS)$(CPU)"=="SOLARISS" +.IF "$(OS)$(CPUNAME)"=="SOLARISSPARC" SHL1VERSIONMAP= sols.map .ENDIF 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 8036d0a..c774fc8 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 @@ -93,7 +93,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" @@ -102,7 +102,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..22896ab 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[INTELX86_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..ed2df1a 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" CXXFLAGS+=-malign-natural .EXPORT: CXXFLAGS .ENDIF -- 1.7.9.2