[openwrt/openwrt] gettext-full: link libiconv when building host pkg

LEDE Commits lede-commits at lists.infradead.org
Tue Jun 4 05:27:39 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/a691e7d8ad140b8f8716a66b2e72daf404cb3f92

commit a691e7d8ad140b8f8716a66b2e72daf404cb3f92
Author: Yanase Yuki <dev at zpc.st>
AuthorDate: Thu Mar 7 17:31:34 2024 +0900

    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 <dev at zpc.st>
    (cherry picked from commit 63dd14b906e9eb27bc878b95ac6777a3624b1135)
    Link: https://github.com/openwrt/openwrt/pull/15627
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 package/libs/gettext-full/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
index 1ed0e82df0..b974131fbd 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:= \
@@ -99,14 +99,12 @@ HOST_CONFIGURE_ARGS += \
 	--disable-java \
 	--disable-openmp \
 	--without-emacs \
+	--with-libiconv-prefix=$(STAGING_DIR_HOSTPKG) \
 	--with-libunistring-prefix=$(STAGING_DIR_HOSTPKG) \
 	--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 \
 
 HOST_CFLAGS += $(HOST_FPIC)
 




More information about the lede-commits mailing list