[Buildroot] [git commit branch/2022.05.x] package/libpsl: require libiconv if !BR2_ENABLE_LOCALE

* [Buildroot] [git commit branch/2022.05.x] package/libpsl: require libiconv if !BR2_ENABLE_LOCALE
@ 2022-08-11 11:43 Peter Korsgaard
  0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2022-08-11 11:43 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=df77da086d95cac0d87adc31e5c6c6fb84c0cfd0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.05.x

Fixes build error

Checking for function "iconv_open" : NO
Header <iconv.h> has symbol "iconv_open" : NO

output/build/libpsl-0.21.1/meson.build:101:4:
 ERROR: Problem encountered: iconv implementation not found

using this defconfig:

BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_PACKAGE_LIBPSL=y

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 4245a28f0e63de48be7a198fa3ec2d53f1f0607f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libpsl/Config.in | 1 +
 package/libpsl/libpsl.mk | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/package/libpsl/Config.in b/package/libpsl/Config.in
index a4cbce6b43..7b02d961c8 100644
--- a/package/libpsl/Config.in
+++ b/package/libpsl/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBPSL
 	bool "libpsl"
 	depends on BR2_USE_WCHAR # libunistring, icu
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_ICU && !BR2_PACKAGE_LIBIDN
 	select BR2_PACKAGE_LIBUNISTRING if !BR2_PACKAGE_ICU
 	help
diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk
index 5dc03a7c24..742117e8ea 100644
--- a/package/libpsl/libpsl.mk
+++ b/package/libpsl/libpsl.mk
@@ -11,6 +11,10 @@ LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium
 LIBPSL_DEPENDENCIES = host-pkgconf
 LIBPSL_INSTALL_STAGING = YES
 
+ifeq ($(BR2_ENABLE_LOCALE),)
+LIBPSL_DEPENDENCIES += libiconv
+endif
+
 # The order of checks is the same as done by libpsl when configured.
 ifeq ($(BR2_PACKAGE_LIBIDN2)$(BR2_PACKAGE_LIBUNISTRING),yy)
 LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] only message in thread