From 3bad25e5abec85d703d38e9e4c0e508bbda971c4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 15 May 2022 10:49:49 +0200 Subject: [PATCH] package/duktape: can't be built with BR2_OPTIMIZE_FAST duktape can't be used with BR2_OPTIMIZE_FAST resulting in the following build failure in polkit: In file included from /nvmedata/autobuild/instance-27/output-1/host/aarch64_be-buildroot-linux-gnu/sysroot/usr/include/duktape.h:202, from ../src/polkitbackend/polkitbackendduktapeauthority.c:28: /nvmedata/autobuild/instance-27/output-1/host/aarch64_be-buildroot-linux-gnu/sysroot/usr/include/duk_config.h:2893:2: error: #error __FAST_MATH__ defined, refusing to compile 2893 | #error __FAST_MATH__ defined, refusing to compile | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/587485bcfd85dfd974608aa00b9bd0c42a3a61d8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit c1dcf18c8d227067bea58e12d30324515e29193b) Signed-off-by: Peter Korsgaard --- package/cups-pk-helper/Config.in | 4 ++++ package/duktape/Config.in | 4 ++++ package/polkit/Config.in | 4 ++++ package/systemd/Config.in | 4 ++++ package/udisks/Config.in | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/package/cups-pk-helper/Config.in b/package/cups-pk-helper/Config.in index 113f433795..756ac49cfa 100644 --- a/package/cups-pk-helper/Config.in +++ b/package/cups-pk-helper/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_CUPS_PK_HELPER depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, polkit depends on BR2_USE_WCHAR # libglib2 depends on !BR2_STATIC_LIBS # polkit -> duktape + depends on !BR2_OPTIMIZE_FAST # polkit -> duktape depends on BR2_PACKAGE_CUPS select BR2_PACKAGE_POLKIT help @@ -17,3 +18,6 @@ comment "cups-pk-helper support needs a toolchain with threads, wchar, dynamic l depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +comment "cups-pk-helper can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST diff --git a/package/duktape/Config.in b/package/duktape/Config.in index 5dad5c3e7c..38f2c48cc0 100644 --- a/package/duktape/Config.in +++ b/package/duktape/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DUKTAPE bool "duktape" depends on !BR2_STATIC_LIBS + depends on !BR2_OPTIMIZE_FAST help Duktape is an embeddable Javascript engine, with a focus on portability and compact footprint. @@ -14,3 +15,6 @@ config BR2_PACKAGE_DUKTAPE comment "duktape needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + +comment "duktape can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST diff --git a/package/polkit/Config.in b/package/polkit/Config.in index 622cbbb90b..ca3323931c 100644 --- a/package/polkit/Config.in +++ b/package/polkit/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_POLKIT depends on BR2_USE_MMU # libglib2, dbus depends on BR2_USE_WCHAR # libglib2 depends on !BR2_STATIC_LIBS # duktape + depends on !BR2_OPTIMIZE_FAST # duktape select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_DUKTAPE select BR2_PACKAGE_EXPAT @@ -20,3 +21,6 @@ comment "polkit needs a toolchain with dynamic library, wchar, threads, gcc >= 7 depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + +comment "polkit can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 00c817172d..d5d88404de 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -359,6 +359,7 @@ config BR2_PACKAGE_SYSTEMD_POLKIT depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> c++17 depends on BR2_TOOLCHAIN_HAS_THREADS # polkit depends on BR2_USE_WCHAR # libglib2 + depends on !BR2_OPTIMIZE_FAST # polkit -> duktape select BR2_PACKAGE_POLKIT help If enabled, systemd is built with polkit support and policy @@ -372,6 +373,9 @@ comment "polkit support needs a toolchain with threads, wchar, gcc >= 7" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS +comment "polkit support can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + config BR2_PACKAGE_SYSTEMD_PORTABLED bool "enable portable services" help diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 82f11ae7de..a3a0f82144 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_UDISKS depends on BR2_USE_WCHAR # dbus-glib -> glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libblockdev -> cryptsetup -> json-c depends on !BR2_STATIC_LIBS # polkit -> duktape + depends on !BR2_OPTIMIZE_FAST # polkit -> duktape select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_LIBATASMART @@ -45,3 +46,6 @@ comment "udisks needs a toolchain with dynamic library, locale, wchar, threads, depends on BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + +comment "udisks can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST