diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-02-22 01:47:15 +0100 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-22 17:54:02 +0100 |
commit | 4be15fdd7974564faa97454fda415b3882c4142f (patch) | |
tree | 8f64a5ffb1047b6b8daef6037564a1209c4251a8 /external/libgpg-error/ExternalProject_libgpg-error.mk | |
parent | 1dcfa88c307d2f3ebe6d42fe00570c25c1efacf8 (diff) |
gpg4libre: build libgpg-error natively on windows
Change-Id: I479b79a7626469169af582dc79c4e99dc4620546
Reviewed-on: https://gerrit.libreoffice.org/34530
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'external/libgpg-error/ExternalProject_libgpg-error.mk')
-rw-r--r-- | external/libgpg-error/ExternalProject_libgpg-error.mk | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 34a87c546f4e..ef22e3926b69 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -15,17 +15,38 @@ $(eval $(call gb_ExternalProject_register_targets,libgpg-error,\ $(eval $(call gb_ExternalProject_use_autoconf,libgpg-error,build)) +ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_ExternalProject_run,build,\ MAKE=$(MAKE) ./configure \ + --enable-static \ + --disable-shared \ --disable-rpath \ --disable-languages \ --disable-doc \ + --disable-tests \ $(if $(filter LINUX,$(OS)), \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ + --host=$(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \ + && $(MAKE) \ + ) + +else +$(call gb_ExternalProject_get_state_target,libgpg-error,build): + $(call gb_ExternalProject_run,build,\ + MAKE=$(MAKE) ./configure \ + --disable-rpath \ + --disable-languages \ + --disable-doc \ + $(if $(filter LINUX,$(OS)), \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ + CPPFLAGS=" $(SOLARINC)" \ + $(if $(filter MSC,$(COM)),--force_use_syscfg=true) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) +endif # vim: set noet sw=4 ts=4: |