diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-23 10:04:29 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-05-05 21:14:30 +0200 |
| commit | 013ddc4f5307df512767ca23b3922540b2b36d52 (patch) | |
| tree | 2bff87fd1dcdcd8dc99358ba1ddaee606dd38b08 /external/postgresql | |
| parent | 983c41278899674028040c70c6e6415574b701f1 (diff) | |
Switch OPENSSL config var from negative to positive
- align with most of the rest of config_host
- rename DISABLE_OPENSSL to ENABLE_OPENSSL
- make this configurable
Change-Id: Ic3b41fcdda38db66134939f12265e0da24833d60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114564
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'external/postgresql')
| -rw-r--r-- | external/postgresql/ExternalProject_postgresql.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index c0713161878f..ea822ebe3208 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -41,7 +41,7 @@ ifeq ($(SYSTEM_ZLIB),) postgresql_LDFLAGS += $(ZLIB_LIBS) endif -ifeq ($(DISABLE_OPENSSL),) +ifeq ($(ENABLE_OPENSSL),TRUE) ifeq ($(SYSTEM_OPENSSL),) postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)/ $(if $(filter $(OS),LINUX),-pthread) @@ -70,7 +70,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : --without-zlib \ --with-ldap \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(DISABLE_OPENSSL),,--with-openssl \ + $(if $(ENABLE_OPENSSL),--with-openssl \ $(if $(WITH_GSSAPI),--with-gssapi)) \ $(if $(ENABLE_LDAP),,--with-ldap=no) \ CFLAGS="-fPIC" \ |