[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - RepositoryExternal.mk

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37dff3f325c79163ff12a306e7ad15dc510ae16d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jan 7 10:15:51 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Fri Jan 15 16:36:02 2021 +0100

    openssl_headers depends on generated opensslconf.h
    
    ...at workdir/UnpackedTarball/openssl/include/openssl/opensslconf.h, as can be
    seen with failed builds like
    <https://ci.libreoffice.org//job/lo_tb_master_mac/35209>:
    
    [...]
    > [build PAT] openssl
    > [build C  ] UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw.c
    > [build C  ] UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt.c
    > [build DEP] LNK:Library/libclucene.dylib
    > [build LNK] Library/libclucene.dylib
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_tb_master_mac/workdir/UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt.c:21:
    > /Users/tdf/lode/jenkins/workspace/lo_tb_master_mac/workdir/UnpackedTarball/openssl/include/openssl/evp.h:13:11: fatal error: 'openssl/opensslconf.h' file not found
    > # include <openssl/opensslconf.h>
    >           ^~~~~~~~~~~~~~~~~~~~~~~
    > 1 error generated.
    
    Change-Id: Ied1dcdd0afb6099e9218671c6a06c0edaafc931e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108928
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 0f7008e91f45cf8e3cee6f372ce012b38a795e26)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109355
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 09e860a4987d..f6d368e2cccf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1592,7 +1592,7 @@ $(call gb_ExternalProject_use_package,$(1),openssl)
 endef
 
 define gb_LinkTarget__use_openssl_headers
-$(call gb_LinkTarget_use_external_project,$(1),openssl)
+$(call gb_LinkTarget_use_external_project,$(1),openssl,full)
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
 	$$(INCLUDE) \