normalize values of MINGW_SHARED_GCCLIB/MINGW_SHARED_GXXLIB

Change-Id: I4f4cecd95f87b9d37fa1b1a270cf554d7707aaa2

configure.ac

@@ -5709,10 +5709,10 @@ using namespace std;
 ]], [[ try { throw 42; } catch (int e) { cout << "Yep, " << e << endl; } ]])],[
             MINGW_GCCDLL=`$OBJDUMP -p conftest.exe | grep 'DLL Name: libgcc' | $SED -e 's@.*DLL Name: @@'`
             if test -n "$MINGW_GCCDLL"; then
-                MINGW_SHARED_GCCLIB=YES
+                MINGW_SHARED_GCCLIB=TRUE
                 AC_MSG_RESULT([ $MINGW_GCCDLL])
             else
-                MINGW_SHARED_GCCLIB=NO
+                MINGW_SHARED_GCCLIB=
                 AC_MSG_RESULT([no])
             fi
        ],[ AC_MSG_RESULT([no])
@@ -5733,10 +5733,10 @@ using namespace std;
                     mingw_gxxdll_root=${mingw_gxxdll_root%-[[0-9]]}
                 fi
                 MINGW_SHARED_LIBSTDCPP=-l$mingw_gxxdll_root
-                MINGW_SHARED_GXXLIB=YES
+                MINGW_SHARED_GXXLIB=TRUE
                 AC_MSG_RESULT([$MINGW_GXXDLL])
             else
-                MINGW_SHARED_GXXLIB=NO
+                MINGW_SHARED_GXXLIB=
                 AC_MSG_RESULT([no])
             fi
        ],[ AC_MSG_RESULT([no])

external/curl/ExternalProject_curl.mk

@@ -64,8 +64,8 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 		./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \
 			--disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \
 			$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
-			CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-			LIBS="-lws2_32 -lwinmm $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+			CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+			LIBS="-lws2_32 -lwinmm $(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \
 			LDFLAGS="$(patsubst ;, -L,$(ILIB))" \
 			CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" \
 		&& cd lib \

external/icu/ExternalProject_icu.mk

@@ -32,9 +32,9 @@ else
 $(call gb_ExternalProject_get_state_target,icu,build) :
 	$(call gb_ExternalProject_run,build,\
 		CPPFLAGS=$(icu_CPPFLAGS) CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" \
-		LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+		LIBS="$(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \
 		LDFLAGS="-L$(COMPATH)/lib -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 \
-				$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+				$(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
 		./configure \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \

external/libxml2/ExternalProject_xml2.mk

@@ -21,8 +21,8 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
 			--without-lzma \
 			--disable-static --without-debug lt_cv_cc_dll_switch="-shared" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-			CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-			LIBS="-lws2_32 $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+			CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+			LIBS="-lws2_32 $(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \
 			LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
 			OBJDUMP=objdump \
 		&& $(MAKE) \

external/libxmlsec/ExternalProject_xmlsec.mk

@@ -28,9 +28,9 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 		&& ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			--without-libxslt --without-openssl --without-gnutls --disable-crypto-dl \
 			$(if $(SYSTEM_NSS),,--disable-pkgconfig) \
-			CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+			CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
 			LDFLAGS="-Wl$(COMMA)--no-undefined $(ILIB:;= -L)" \
-			LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))" \
+			LIBS="$(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED__LIBSTDCPP))" \
 			lt_cv_deplibs_check_method=pass_all \
 		&& $(MAKE) \
 	)

external/libxslt/ExternalProject_xslt.mk

@@ -20,8 +20,8 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 	$(call gb_ExternalProject_run,build,\
 		./configure --without-crypto --without-python --disable-static \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-			CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-			$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
+			CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+			$(if $(MINGW_SHARED_GXXLIB),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
 			LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
 			OBJDUMP=objdump \
 		&& chmod 777 xslt-config \

external/lpsolve/ExternalProject_lpsolve.mk

@@ -18,8 +18,8 @@ ifeq ($(COM),GCC)
 $(call gb_ExternalProject_get_state_target,lpsolve,build):
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter WNT,$(OS_FOR_BUILD)), \
-		$(if $(filter YES,$(MINGW_SHARED_GCCLIB)) lpsolve_LDFLAGS="-shared-libgcc") \
-		$(if $(filter YES,$(MINGW_SHARED_GXXLIB)) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
+		$(if $(MINGW_SHARED_GCCLIB) lpsolve_LDFLAGS="-shared-libgcc") \
+		$(if $(MINGW_SHARED_GXXLIB) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
 		cmd /c cgcc.bat, sh ccc) \
 	,lpsolve55)
 else # $(COM)!=GCC

external/mingw-externals/Package_mingw_gccdlls.mk

@@ -12,8 +12,8 @@ $(eval $(call gb_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin))
 $(error FIXME do not deliver this stuff to OUTDIR)
 
 $(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\
-    $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \
-    $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \
+    $(if $(MINGW_SHARED_GCCLIB),$(MINGW_GCCDLL)) \
+    $(if $(MINGW_SHARED_GXXLIB),$(MINGW_GXXDLL)) \
 ))
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

external/nss/ExternalProject_nss.mk

@@ -41,9 +41,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
 	$(call gb_ExternalProject_run,build,\
 		$(MAKE) -j1 nss_build_all \
 			NS_USE_GCC=1 \
-			CC="$(CC) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-			CXX="$(CXX) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
-			OS_LIBS="-ladvapi32 -lws2_32 -lmswsock -lwinmm $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+			CC="$(CC) $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+			CXX="$(CXX) $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+			OS_LIBS="-ladvapi32 -lws2_32 -lmswsock -lwinmm $(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \
 			LDFLAGS="" \
 			PATH="$(PATH)" \
 			RANLIB="$(RANLIB)" \

external/openssl/opensslmingw.patch

@@ -53,8 +53,8 @@
  if errorlevel 1 goto end
 +dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def
 +if errorlevel 1 goto end
-+if "%MINGW_SHARED_GXXLIB%"=="YES" goto shared_gxxlib
-+if "%MINGW_SHARED_GCCLIB%"=="YES" goto shared_gcclib
++if "%MINGW_SHARED_GXXLIB%"=="TRUE" goto shared_gxxlib
++if "%MINGW_SHARED_GCCLIB%"=="TRUE" goto shared_gcclib
 +gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 
 +if errorlevel 1 goto end
 +gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto 

external/python3/ExternalProject_python3.mk

@@ -84,7 +84,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 			$(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \
 			$(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \
 			$(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \
-				$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \
+				$(if $(MINGW_SHARED_GCCLIB),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \
 			$(gb_LTOFLAGS) \
 			)" \
 		&& MAKEFLAGS= $(MAKE) \

external/redland/ExternalProject_raptor.mk

@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,raptor,\
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,raptor,build):
 	$(call gb_ExternalProject_run,build,\
-		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+		CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
 		LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
 		$(if $(and $(SYSTEM_LIBXML),$(filter GCC,$(COM))),PATH="$(MINGW_SYSROOT)/bin:$$PATH") \

external/redland/ExternalProject_rasqal.mk

@@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,rasqal,build):
 	$(call gb_ExternalProject_run,build,\
-		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+		CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
 		LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L$,$(ILIB))" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
 		PKG_CONFIG="" \

external/redland/ExternalProject_redland.mk

@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,redland,build):
 	$(call gb_ExternalProject_run,build,\
-		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+		CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
 		LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
 		PKG_CONFIG="" \