fdo#42783: remove CPU variable from environment

Replace uses with CPUNAME instead, and get rid of the horrible
postgresql patch that worked around environment leakage.

Change-Id: I38ccabfc438360524a272901bb9332ea708e274c

4 files changed, 11 insertions, 52 deletions

diff --git a/external/mingw-externals/CustomTarget_jawt.mk b/external/mingw-externals/CustomTarget_jawt.mk
index 2d35d93a24c2..1fb5fa872eb2 100644
--- a/external/mingw-externals/CustomTarget_jawt.mk
+++ b/external/mingw-externals/CustomTarget_jawt.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_CustomTarget_register_targets,external/jawt,\
 	libjawt.dll.a \
 ))
 
-ifeq ($(OS)$(CPU),WNTX)
+ifeq ($(OS)-$(CPUNAME),WNT-X86_64)
 $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo EXPORTS > $@
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index af354e517763..0bd7a38a451a 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
 	$(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
 	mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-		$(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \
+		$(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
 	,,nss_configure.log)
 
 ifeq ($(OS),WNT)
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
 	$(call gb_ExternalProject_run,build,\
 		$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
 		MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
-		$(if $(filter X,$(CPU)),USE_64=1) \
+		$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
 		LIB="$(ILIB)" \
 		XCFLAGS="$(SOLARINC)" \
 		$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
@@ -58,7 +58,7 @@ endif
 else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_ExternalProject_run,build,\
-		$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \
+		$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \
 		$(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
 			NSS_USE_SYSTEM_SQLITE=1) \
 		$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index e41adb868e5a..919e354f6d7f 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -19,10 +19,10 @@ $(eval $(call gb_ExternalProject_register_targets,openssl,\
 
 OPENSSL_PLATFORM := \
   $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\
-    $(if $(filter I,$(CPU)),\
+    $(if $(filter INTEL,$(CPUNAME)),\
       $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf)\
     ,\
-      $(if $(filter X,$(CPU)),\
+      $(if $(filter X86_64,$(CPUNAME)),\
         $(if $(filter GNU/kFreeBSD,$(shell uname)),\
           debian-kfreebsd-amd64\
         ,\
@@ -34,10 +34,8 @@ OPENSSL_PLATFORM := \
     )\
   ,\
     $(if $(filter SOLARIS,$(OS)),\
-      $(if $(filter INTEL,$(CPUNAME)),\
-        $(if $(filter X,$(CPU)),solaris64-x86_64-cc,solaris-x86-cc)\
-      ,\
-        solaris-sparcv9-cc\
+      $(if $(filter INTEL,$(CPUNAME)),solaris-x86-cc,\
+        $(if $(filter X86_64,$(CPUNAME)),solaris64-x86_64-cc,solaris-sparcv9-cc)\
       )\
     ,\
       $(if $(filter IOS,$(OS)),\
@@ -47,11 +45,11 @@ OPENSSL_PLATFORM := \
           $(if $(filter GCC,$(COM)),\
             mingw\
           ,\
-            $(if $(filter I,$(CPU)),VC-WIN32,VC-WIN64A)\
+            $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\
           )\
         ,\
           $(if $(filter MACOSX,$(OS)),\
-            $(if $(filter I,$(CPU)),darwin-i386-cc,darwin64-x86_64-cc)\
+            $(if $(filter INTEL,$(CPUNAME)),darwin-i386-cc,darwin64-x86_64-cc)\
           )\
         )\
       )\
diff --git a/external/postgresql/postgresql-9.2.1-libreoffice.patch b/external/postgresql/postgresql-9.2.1-libreoffice.patch
index 87d3da716644..174ee8551a78 100644
--- a/external/postgresql/postgresql-9.2.1-libreoffice.patch
+++ b/external/postgresql/postgresql-9.2.1-libreoffice.patch
@@ -9,28 +9,7 @@
 +	@printf '%s\n' 'LIBPQ_DEP_LIBS+=$(SHLIB_LINK)' > '$@'
 --- misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak	2011-12-14 14:28:59.000000000 +0100
 +++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak	2011-12-15 09:11:37.000000000 +0100
-@@ -11,30 +11,29 @@
- 
- # CPU="i386" or CPU environment of nmake.exe (AMD64 or IA64)
- 
--!IF ("$(CPU)" == "")||("$(CPU)" == "i386")
--CPU=i386
-+!IF ("$(CPU)" == "")||("$(CPU)" == "I")
-+MACHINE=i386
- !MESSAGE Building the Win32 static library...
- !MESSAGE
--!ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64")
-+!ELSEIF ("$(CPU)" == "X")
-+MACHINE=AMD64
- ADD_DEFINES=/D "WIN64" /Wp64 /GS
- ADD_SECLIB=bufferoverflowU.lib
- !MESSAGE Building the Win64 static library...
- !MESSAGE
- !ELSE
- !MESSAGE Please check a CPU=$(CPU) ?
--!MESSAGE CPU=i386 or AMD64 or IA64
-+!MESSAGE CPU=I or X
- !ERROR Make aborted.
+@@ -11,14 +11,12 @@
  !ENDIF
  
  !IFDEF DEBUG
@@ -47,15 +26,6 @@
  OUTFILENAME=libpq
  !ENDIF
  
-@@ -54,7 +53,7 @@
- !ENDIF
- 
- !IF "$(KFW_LIB_PATH)" == ""
--KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(CPU)
-+KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(MACHINE)
- !MESSAGE Using default Kerberos Library directory: $(KFW_LIB_PATH)
- !ENDIF
- 
 @@ -67,18 +66,11 @@
  CPP=cl.exe
  RSC=rc.exe
@@ -92,15 +62,6 @@
   /D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES)
  
  !IFDEF USE_SSL
-@@ -205,7 +198,7 @@
- LINK32=link.exe
- LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib ws2_32.lib secur32.lib $(SSL_LIBS)  $(KFW_LIB) $(ADD_SECLIB) \
-  /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
-- /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \
-+ /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(MACHINE) \
-  /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
-  /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  \
-  /libpath:"$(SSL_LIB_PATH)" /libpath:"$(KFW_LIB_PATH)" \
 @@ -222,7 +215,7 @@
  <<