| Message ID | 20220705064119.1041728-1-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/libpsl: require libiconv if !BR2_ENABLE_LOCALE | expand |
On Tue, 05 Jul 2022 08:41:19 +0200 Bernd Kuhls <bernd.kuhls@t-online.de> wrote: > 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> > --- > 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 > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > Cheers, —Adrián
On Tue, 5 Jul 2022 08:41:19 +0200 Bernd Kuhls <bernd.kuhls@t-online.de> wrote: > 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> > --- > package/libpsl/Config.in | 1 + > package/libpsl/libpsl.mk | 4 ++++ > 2 files changed, 5 insertions(+) Applied to master, thanks. Thomas
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes: > 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> Committed to 2022.05.x and 2022.02.x, thanks.
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
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> --- package/libpsl/Config.in | 1 + package/libpsl/libpsl.mk | 4 ++++ 2 files changed, 5 insertions(+)