[Libreoffice-commits] core.git: 2 commits - connectivity/Module_connectivity.mk external/jpeg-turbo

[Stephan Bergmann]

 connectivity/Module_connectivity.mk               |    6 +-----
 external/jpeg-turbo/ExternalProject_jpeg-turbo.mk |    2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 0c3505f01a792449b0c6bf81f518e7a062eea146
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 4 17:26:44 2015 +0100

    Typo $(CPU) -> $(CPUNAME)
    
    Change-Id: I2e121c36021508bbdbc9111087f5cc6e1aae6524

diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 97310d1..1ba9e7b 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -102,7 +102,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
-ifeq ($(OS)-$(CPU),WNT-INTEL)
+ifeq ($(OS)-$(CPUNAME),WNT-INTEL)
 
 ifneq ($(WITH_MOZAB4WIN),)
 $(eval $(call gb_Module_add_targets,connectivity,\
diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
index ad35a6f..c913d70 100755
--- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
+++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,build) : $(call gb_Externa
 $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) :
 	$(call gb_ExternalProject_run,configure,\
 		MAKE=$(MAKE) ./configure \
-			--build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPU)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \
+			--build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \
 			--with-pic \
 			--enable-static \
 			--disable-shared \
commit 484d5914575feb30146e0b75cef4860652805fa6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 4 17:24:41 2015 +0100

    Revert "Do not let WNT non-INTEL run into the else branch"
    
    This reverts commit c0f080403b869e162dc81db6c8c50b7360a88883,
    logic error, true fix will follow.

diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index ade21dd..97310d1 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -102,9 +102,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
-ifeq ($(OS),WNT)
-
-ifeq ($(CPU),INTEL)
+ifeq ($(OS)-$(CPU),WNT-INTEL)
 
 ifneq ($(WITH_MOZAB4WIN),)
 $(eval $(call gb_Module_add_targets,connectivity,\
@@ -118,8 +116,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
-endif
-
 else ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,connectivity,\