diff options
| -rw-r--r-- | RepositoryExternal.mk | 3 | ||||
| -rw-r--r-- | external/gpgmepp/ExternalProject_gpgmepp.mk | 1 | ||||
| -rw-r--r-- | external/libassuan/ExternalProject_libassuan.mk | 1 | ||||
| -rw-r--r-- | external/libgpg-error/ExternalProject_libgpg-error.mk | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bdc5d65a2d81..b0f0c17068ff 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3555,6 +3555,9 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ -L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ -lgpgmepp \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L$(call gb_UnpackedTarball_get_dir,gpgmepp)/src/.libs/ -lgpgme) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),$$(GPG_ERROR_LIBS)) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),$$(LIBASSUAN_LIBS)) \ ) endef diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index ec865fcb2ca8..d144b78dcce7 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -70,6 +70,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 8162d6339411..988bd10c00e7 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -49,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 6c437ef8c884..20a4330b3681 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -45,6 +45,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(if $(filter MSC,$(COM)),--force_use_syscfg=true) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ && $(MAKE) \ ) |