From: Michael Pratt Date: Sat, 13 May 2023 22:53:00 +0000 (-0400) Subject: gettext-full: link to local libunistring X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0779c47be6e6a12ba7a1dca7526f12a10b48b64f;p=openwrt%2Fstaging%2Fnbd.git gettext-full: link to local libunistring Configure gettext to require and link to our local libunistring explicitly. Signed-off-by: Michael Pratt --- 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 += \