* [Buildroot] [PATCH v2, 1/1] package/mariadb: fix build with libressl
@ 2022-04-18 21:54 Fabrice Fontaine
2022-04-23 15:04 ` Arnout Vandecappelle
2022-05-24 15:02 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-04-18 21:54 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Fix the following build failure with libressl:
CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately:
LIBRESSL_RESULT (advanced)
LIBRESSL_RESULT__TRYRUN_OUTPUT (advanced)
For details see /nvmedata/autobuild/instance-27/output-1/build/mariadb-10.3.34/TryRunResults.cmake
Fixes:
- http://autobuild.buildroot.org/results/cbdbfcdae4b89ac678e1bf6bcded96872c7223ab
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2:
- Prepend "LibreSSL " to $(LIBRESSL_VERSION) as
libmariadb/cmake/libressl_version.c prints LIBRESSL_VERSION_TEXT
package/mariadb/mariadb.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index 4eb9c71827..18667e7e70 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -60,6 +60,12 @@ MARIADB_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1
# Explicitly disable dtrace to avoid detection of a host version
MARIADB_CONF_OPTS += -DENABLE_DTRACE=0
+ifeq ($(BR2_PACKAGE_LIBRESSL),y)
+MARIADB_CONF_OPTS += \
+ -DLIBRESSL_RESULT=ON \
+ -DLIBRESSL_RESULT__TRYRUN_OUTPUT="LibreSSL $(LIBRESSL_VERSION)"
+endif
+
ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y)
ifeq ($(BR2_PACKAGE_MARIADB_SERVER_EMBEDDED),y)
MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v2, 1/1] package/mariadb: fix build with libressl
2022-04-18 21:54 [Buildroot] [PATCH v2, 1/1] package/mariadb: fix build with libressl Fabrice Fontaine
@ 2022-04-23 15:04 ` Arnout Vandecappelle
2022-05-24 15:02 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2022-04-23 15:04 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot
On 18/04/2022 23:54, Fabrice Fontaine wrote:
> Fix the following build failure with libressl:
>
> CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately:
> LIBRESSL_RESULT (advanced)
> LIBRESSL_RESULT__TRYRUN_OUTPUT (advanced)
> For details see /nvmedata/autobuild/instance-27/output-1/build/mariadb-10.3.34/TryRunResults.cmake
>
> Fixes:
> - http://autobuild.buildroot.org/results/cbdbfcdae4b89ac678e1bf6bcded96872c7223ab
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> Changes v1 -> v2:
> - Prepend "LibreSSL " to $(LIBRESSL_VERSION) as
> libmariadb/cmake/libressl_version.c prints LIBRESSL_VERSION_TEXT
>
> package/mariadb/mariadb.mk | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
> index 4eb9c71827..18667e7e70 100644
> --- a/package/mariadb/mariadb.mk
> +++ b/package/mariadb/mariadb.mk
> @@ -60,6 +60,12 @@ MARIADB_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1
> # Explicitly disable dtrace to avoid detection of a host version
> MARIADB_CONF_OPTS += -DENABLE_DTRACE=0
>
> +ifeq ($(BR2_PACKAGE_LIBRESSL),y)
> +MARIADB_CONF_OPTS += \
> + -DLIBRESSL_RESULT=ON \
> + -DLIBRESSL_RESULT__TRYRUN_OUTPUT="LibreSSL $(LIBRESSL_VERSION)"
> +endif
> +
> ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y)
> ifeq ($(BR2_PACKAGE_MARIADB_SERVER_EMBEDDED),y)
> MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v2, 1/1] package/mariadb: fix build with libressl
2022-04-18 21:54 [Buildroot] [PATCH v2, 1/1] package/mariadb: fix build with libressl Fabrice Fontaine
2022-04-23 15:04 ` Arnout Vandecappelle
@ 2022-05-24 15:02 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2022-05-24 15:02 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Fix the following build failure with libressl:
> CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately:
> LIBRESSL_RESULT (advanced)
> LIBRESSL_RESULT__TRYRUN_OUTPUT (advanced)
> For details see /nvmedata/autobuild/instance-27/output-1/build/mariadb-10.3.34/TryRunResults.cmake
> Fixes:
> - http://autobuild.buildroot.org/results/cbdbfcdae4b89ac678e1bf6bcded96872c7223ab
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2:
> - Prepend "LibreSSL " to $(LIBRESSL_VERSION) as
> libmariadb/cmake/libressl_version.c prints LIBRESSL_VERSION_TEXT
Committed to 2021.02.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-24 15:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-18 21:54 [Buildroot] [PATCH v2, 1/1] package/mariadb: fix build with libressl Fabrice Fontaine
2022-04-23 15:04 ` Arnout Vandecappelle
2022-05-24 15:02 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.