configure.ac | 2 +-
external/openssl/ExternalProject_openssl.mk | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit a2fb7ac13e6e1cc27559871f0455342bdcccaa40
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon May 24 20:15:14 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Jan 15 08:31:52 2024 +0100
FreeBSD: fix OPENSSL_PLATFORM
Change-Id: I0f48d572edaed7e996be7a75d524c7d540a76ecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162064
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/external/openssl/ExternalProject_openssl.mk
b/external/openssl/ExternalProject_openssl.mk
index d197721d024a..048158700f84 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -26,7 +26,9 @@ OPENSSL_PLATFORM := \
$(if $(filter GNU/kFreeBSD,$(shell uname)),\
debian-kfreebsd-amd64\
,\
- $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64,
linux-generic64) no-asm\
+ $(if $(filter FreeBSD,$(shell uname)), BSD-x86_64,\
+ $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64,
linux-generic64) no-asm\
+ )\
)\
,\
$(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32,
linux-generic32)\
commit 29df00696393c63be1071357e7d404610dc71ba8
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon May 24 20:12:36 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Jan 15 08:31:42 2024 +0100
FreeBSD: evaluate --with-gnu-patch
Change-Id: I41e2cc8dc74022c840dac6355ed29cc0c4c40b17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162063
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/configure.ac b/configure.ac
index b8ddf562d6c7..859b404d287a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11656,7 +11656,7 @@ if test -z "$PATCH"; then
fi
dnl On Solaris or macOS, check if --with-gnu-patch was used
-if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then
+if test "$_os" = "SunOS" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
if test -z "$with_gnu_patch"; then
GNUPATCH=$PATCH
else
