From: RISCi_ATOM Date: Fri, 19 Apr 2024 21:03:53 +0000 (-0400) Subject: gettext-full: link libiconv when building host pkg X-Git-Tag: v6.1-20240701~42 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7862e777c3505c76ebd17b852fa01e497299ef35;p=librecmc%2Flibrecmc.git gettext-full: link libiconv when building host pkg On Fedora 40 system, some compile error happens when building iconv-ostream.c. Linking to libiconv-full fixes this. Signed-off-by: Yanase Yuki Picked from upstream 63dd14b906e9eb27bc878b95ac6777a3624b1135 --- diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile index 1ed0e82df0..837528e880 100644 --- a/package/libs/gettext-full/Makefile +++ b/package/libs/gettext-full/Makefile @@ -25,7 +25,7 @@ PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=gettext-full/host libunistring libxml2 PKG_BUILD_PARALLEL:=0 -HOST_BUILD_DEPENDS:=gperf/host libunistring/host libxml2/host +HOST_BUILD_DEPENDS:=gperf/host libiconv-full/host libunistring/host libxml2/host HOST_BUILD_PARALLEL:=0 PKG_SUBDIRS:= \ @@ -89,7 +89,8 @@ CONFIGURE_ARGS += \ --without-libexpat-prefix \ --with-libunistring-prefix=$(STAGING_DIR)/usr \ --with-libxml2-prefix=$(STAGING_DIR) \ - --without-emacs + --without-emacs \ + --with-libiconv-prefix=$(STAGING_DIR_HOSTPKG) HOST_CONFIGURE_ARGS += \ --disable-shared \ @@ -103,10 +104,7 @@ HOST_CONFIGURE_ARGS += \ --with-libxml2-prefix=$(STAGING_DIR_HOSTPKG) HOST_CONFIGURE_VARS += \ - EMACS="no" \ - am_cv_lib_iconv=no \ - am_cv_func_iconv=no \ - ac_cv_header_iconv_h=no \ + EMACS="no" HOST_CFLAGS += $(HOST_FPIC)