summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
Diffstat (limited to 'external')
-rw-r--r--external/curl/ExternalProject_curl.mk4
-rw-r--r--external/icu/ExternalProject_icu.mk4
-rw-r--r--external/libxml2/ExternalProject_xml2.mk4
-rw-r--r--external/libxmlsec/ExternalProject_xmlsec.mk4
-rw-r--r--external/libxslt/ExternalProject_xslt.mk4
-rw-r--r--external/lpsolve/ExternalProject_lpsolve.mk4
-rw-r--r--external/mingw-externals/Package_mingw_gccdlls.mk4
-rw-r--r--external/nss/ExternalProject_nss.mk6
-rw-r--r--external/openssl/opensslmingw.patch4
-rw-r--r--external/python3/ExternalProject_python3.mk2
-rw-r--r--external/redland/ExternalProject_raptor.mk2
-rw-r--r--external/redland/ExternalProject_rasqal.mk2
-rw-r--r--external/redland/ExternalProject_redland.mk2
13 files changed, 23 insertions, 23 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 5e36ec89697b..b012079bae85 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/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 \
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index fa6ea58c8121..78e57acb0f7d 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/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) \
diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index 3f4cb2fd302d..0e775f6c74c1 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/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) \
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index 23eb7bc368af..ed65c70dbc28 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/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) \
)
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index 979ef57dd905..4c4967e3f834 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/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 \
diff --git a/external/lpsolve/ExternalProject_lpsolve.mk b/external/lpsolve/ExternalProject_lpsolve.mk
index 55da70457538..95762982fdb2 100644
--- a/external/lpsolve/ExternalProject_lpsolve.mk
+++ b/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
diff --git a/external/mingw-externals/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk
index d3f94d1af1fa..7b30ae1909ce 100644
--- a/external/mingw-externals/Package_mingw_gccdlls.mk
+++ b/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:
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 775ab5536ec7..b7e07f7bb56f 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/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)" \
diff --git a/external/openssl/opensslmingw.patch b/external/openssl/opensslmingw.patch
index e0dc96029d6b..127cb043df18 100644
--- a/external/openssl/opensslmingw.patch
+++ b/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
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index 0014d7f96dde..1e6f4c8fd6ce 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/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) \
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
index 55dff1264912..0c2916f70a2a 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/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") \
diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
index f1b8d1c74cf2..e67a3028b8f0 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/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="" \
diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
index e643dbcb81ae..7085d3edd7bf 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/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="" \
generated by cgit (git 2.34.1) at 2025-02-25 17:52:57 +0000