ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

external: consistently use gb_ExternalProject_use_nmake

Browse Source 
... instead of hard-coding some subset of the variables everywhere.

Change-Id: I5eac5663563ee9d6cb7b57f5f6e9d55560587276
Reviewed-on: https://gerrit.libreoffice.org/44167
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Michael Stahl
2017-11-01 19:52:53 +01:00
parent cc9b39393b
commit 4fcdc190af
7 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/curl/ExternalProject_curl.mk
Vendored
+3 -2
View File
@@ -69,10 +69,11 @@ $(call gb_ExternalProject_get_state_target,curl,build):
else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalProject_use_nmake,curl,build))
$(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc \
nmake -f Makefile.vc \
mode=dll \
VC=12 \
$(if $(filter X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \
external/libtommath/ExternalProject_libtommath.mk
Vendored
+1 -3
View File
@@ -18,9 +18,7 @@ $(eval $(call gb_ExternalProject_use_nmake,libtommath,build))
ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,libtommath,build):
$(call gb_ExternalProject_run,build,\
export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
&& export LIB="$(ILIB)" \
&& nmake -nologo -f makefile.msvc \
nmake -nologo -f makefile.msvc \
)
else
$(call gb_ExternalProject_get_state_target,libtommath,build) :
external/libxml2/ExternalProject_libxml2.mk
Vendored
+3 -2
View File
@@ -16,13 +16,14 @@ $(eval $(call gb_ExternalProject_register_targets,libxml2,\
ifeq ($(OS),WNT)
$(call gb_ExternalProject_use_external_project,libxml2,icu)
$(eval $(call gb_ExternalProject_use_nmake,libxml2,build))
$(call gb_ExternalProject_get_state_target,libxml2,build):
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
&& unset MAKEFLAGS \
&& LIB="$(ILIB)" nmake \
&& nmake \
,win32)
else # OS!=WNT
$(call gb_ExternalProject_get_state_target,libxml2,build):
external/libxslt/ExternalProject_libxslt.mk
Vendored
+3 -2
View File
@@ -15,14 +15,15 @@ $(eval $(call gb_ExternalProject_register_targets,libxslt,\
build \
))
ifeq ($(OS),WNT)
$(eval $(call gb_ExternalProject_use_nmake,libxslt,build))
$(call gb_ExternalProject_get_state_target,libxslt,build):
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
vcmanifest=yes \
lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
&& unset MAKEFLAGS \
&& LIB="$(ILIB)" nmake \
&& nmake \
,win32)
else # OS!=WNT
$(call gb_ExternalProject_get_state_target,libxslt,build):
external/openssl/ExternalProject_openssl.mk
Vendored
+3 -4
View File
@@ -55,14 +55,13 @@ OPENSSL_PLATFORM := \
)
ifeq ($(COM),MSC)
$(eval $(call gb_ExternalProject_use_nmake,openssl,build))
$(call gb_ExternalProject_get_state_target,openssl,build):
$(call gb_ExternalProject_run,build,\
export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
&& export PERL="$(shell cygpath -w $(PERL))" \
&& export LIB="$(ILIB)" \
export PERL="$(shell cygpath -w $(PERL))" \
&& $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \
&& cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \
&& unset MAKEFLAGS \
&& nmake -f "ms\ntdll.mak" \
&& mv inc32/* include/ \
)
external/postgresql/ExternalProject_postgresql.mk
Vendored
+3 -1
View File
@@ -21,9 +21,11 @@ $(eval $(call gb_ExternalProject_register_targets,postgresql,\
ifeq ($(OS),WNT)
$(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
$(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
MAKEFLAGS= && nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
,src)
else
external/xmlsec/ExternalProject_xmlsec.mk
Vendored
+3 -2
View File
@@ -19,13 +19,14 @@ $(eval $(call gb_ExternalProject_register_targets,xmlsec,\
ifeq ($(OS),WNT)
$(eval $(call gb_ExternalProject_use_nmake,xmlsec,build))
$(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js crypto=mscrypto xslt=no iconv=no static=no \
lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
&& unset MAKEFLAGS \
&& LIB="$(ILIB)" nmake \
&& nmake \
,win32)
else