[openwrt/openwrt] gettext-full: link to local libunistring

LEDE Commits lede-commits at lists.infradead.org
Mon May 15 07:14:58 PDT 2023


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0779c47be6e6a12ba7a1dca7526f12a10b48b64f

commit 0779c47be6e6a12ba7a1dca7526f12a10b48b64f
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Sat May 13 18:53:00 2023 -0400

    gettext-full: link to local libunistring
    
    Configure gettext to require and link
    to our local libunistring explicitly.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 package/libs/gettext-full/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
index c8700de550..1ed0e82df0 100644
--- a/package/libs/gettext-full/Makefile
+++ b/package/libs/gettext-full/Makefile
@@ -22,10 +22,10 @@ PKG_LICENSE:=GPL-3.0-or-later
 PKG_CPE_ID:=cpe:/a:gnu:gettext
 
 PKG_INSTALL:=1
-PKG_BUILD_DEPENDS:=gettext-full/host libxml2
+PKG_BUILD_DEPENDS:=gettext-full/host libunistring libxml2
 PKG_BUILD_PARALLEL:=0
 
-HOST_BUILD_DEPENDS:=gperf/host libxml2/host
+HOST_BUILD_DEPENDS:=gperf/host libunistring/host libxml2/host
 HOST_BUILD_PARALLEL:=0
 
 PKG_SUBDIRS:= \
@@ -87,6 +87,7 @@ CONFIGURE_ARGS += \
 	--with-included-gettext \
 	--without-libintl-prefix \
 	--without-libexpat-prefix \
+	--with-libunistring-prefix=$(STAGING_DIR)/usr \
 	--with-libxml2-prefix=$(STAGING_DIR) \
 	--without-emacs
 
@@ -98,6 +99,7 @@ HOST_CONFIGURE_ARGS += \
 	--disable-java \
 	--disable-openmp \
 	--without-emacs \
+	--with-libunistring-prefix=$(STAGING_DIR_HOSTPKG) \
 	--with-libxml2-prefix=$(STAGING_DIR_HOSTPKG)
 
 HOST_CONFIGURE_VARS += \




More information about the lede-commits mailing list