diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libxmlsec/ExternalProject_xmlsec.mk | 2 | ||||
| -rw-r--r-- | neon/Library_neon.mk | 4 | ||||
| -rw-r--r-- | postgresql/ExternalProject_postgresql.mk | 10 | ||||
| -rw-r--r-- | python3/ExternalPackage_python3.mk | 4 | ||||
| -rw-r--r-- | python3/ExternalProject_python3.mk | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e064b1b9671a..b4def01513e2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1262,7 +1262,7 @@ gb_LinkTarget__use_harfbuzz := endif # ENABLE_HARFBUZZ -ifeq ($(DISABLE_OPENSSL),YES) +ifeq ($(DISABLE_OPENSSL),TRUE) gb_ExternalProject__use_openssl:= gb_LinkTarget__use_openssl_headers:= @@ -1333,7 +1333,7 @@ endif # SYSTEM_OPENSSL endif # DISABLE_OPENSSL -ifeq ($(DISABLE_OPENSSL),YES) +ifeq ($(DISABLE_OPENSSL),TRUE) define gb_LinkTarget__use_gnutls $(call gb_LinkTarget_set_include,$(1),\ diff --git a/configure.ac b/configure.ac index 00419d6798f8..42dfd441ee98 100644 --- a/configure.ac +++ b/configure.ac @@ -9249,7 +9249,7 @@ fi dnl =================================================================== dnl Check for system openssl dnl =================================================================== -DISABLE_OPENSSL="NO" +DISABLE_OPENSSL= AC_MSG_CHECKING([whether to disable OpenSSL usage]) if test "$enable_openssl" = "yes"; then AC_MSG_RESULT([no]) @@ -9290,7 +9290,7 @@ if test "$enable_openssl" = "yes"; then fi else AC_MSG_RESULT([yes]) - DISABLE_OPENSSL=YES + DISABLE_OPENSSL=TRUE # warn that although OpenSSL is disabled, system libraries may be depending on it AC_MSG_WARN([OpenSSL has been disabled. No code compiled by LibO will make use of it but system librares may create indirect dependencies]) diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 2d48faf8927e..93a1b072d5d4 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : autoreconf \ && ./configure \ --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ - $(if $(and $(filter ANDROID,$(OS)),$(filter-out YES,$(DISABLE_OPENSSL))),--with-openssl=$(OUTDIR),--without-openssl) \ + $(if $(filter ANDROID,$(OS)),$(if $(DISABLE_OPENSSL),--without-openssl,--with-openssl=$(OUTDIR))) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index 2dad2ed8f30a..d391a3ea3472 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -61,7 +61,7 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\ )) -ifneq ($(DISABLE_OPENSSL),YES) +ifneq ($(DISABLE_OPENSSL),TRUE) $(eval $(call gb_Library_add_generated_cobjects,neon,\ UnpackedTarball/neon/src/ne_openssl \ )) @@ -89,7 +89,7 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\ )) else -ifneq ($(DISABLE_OPENSSL),YES) +ifneq ($(DISABLE_OPENSSL),TRUE) $(eval $(call gb_Library_add_generated_cobjects,neon,\ UnpackedTarball/neon/src/ne_ntlm \ )) diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 9f495c51b888..76903579cf4d 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -32,15 +32,15 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ ./configure \ --without-readline --disable-shared --with-ldap \ - $(if $(filter-out YES,$(DISABLE_OPENSSL)),--with-openssl) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(and $(filter YES,$(WITH_KRB5)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-krb5) \ - $(if $(and $(filter YES,$(WITH_GSSAPI)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-gssapi) \ + $(if $(DISABLE_OPENSSL),,--with-openssl \ + $(if $(filter YES,$(WITH_KRB5)), --with-krb5) \ + $(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi)) \ CPPFLAGS="$(ZLIB_CFLAGS) \ $(if $(filter NO,$(SYSTEM_OPENLDAP)),\ -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ - $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),\ - -I$(call gb_UnpackedTarball_get_dir,openssl/include))" \ + $(if $(DISABLE_OPENSSL),,$(if $(filter NO,$(SYSTEM_OPENSSL)),\ + -I$(call gb_UnpackedTarball_get_dir,openssl/include)))" \ $(if $(filter NO,$(SYSTEM_OPENLDAP)), \ LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs -L$(OUTDIR)/lib" \ EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index a661ff7c1164..4fefb89f8e80 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -78,7 +78,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor LO_lib/_elementtree.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/fcntl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/grp.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ - $(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + $(if $(DISABLE_OPENSSL),, \ LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ ) \ LO_lib/_heapq.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ @@ -99,7 +99,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor LO_lib/select.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_socket.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ - $(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + $(if $(DISABLE_OPENSSL),, \ LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ ) \ LO_lib/_struct.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 8e7769ba37f6..70063f0f52eb 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -73,8 +73,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : --enable-shared \ ) \ CC="$(strip $(CC) \ - $(if $(filter NO,$(SYSTEM_OPENSSL)),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \ - $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \ + $(if $(filter NO,$(SYSTEM_OPENSSL)),-I$(call gb_UnpackedTarball_get_dir,openssl)/include \ + $(if $(DISABLE_OPENSSL),,-I$(call gb_UnpackedTarball_get_dir,openssl)/include)) \ $(if $(filter NO,$(SYSTEM_EXPAT)),-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \ $(if $(SYSBASE), -I$(SYSBASE)/usr/include) \ )" \ |