[openwrt/openwrt] nls.mk: fixup cmake packages

LEDE Commits lede-commits at lists.infradead.org
Sun Nov 27 04:26:10 PST 2022


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2cb48f58c247c801a101b1625df2ff71a4f8be71

commit 2cb48f58c247c801a101b1625df2ff71a4f8be71
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Mon Nov 21 17:02:31 2022 -0800

    nls.mk: fixup cmake packages
    
    Instead of manually overriding every cmake package that uses iconv or
    gettext's paths, add the prefix in here so that at least FindIconv.cmake
    works. Fixes compilation with BUILD_NLS.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 include/nls.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/nls.mk b/include/nls.mk
index 90fc27660f..f054d2bb68 100644
--- a/include/nls.mk
+++ b/include/nls.mk
@@ -10,6 +10,7 @@ ifeq ($(CONFIG_BUILD_NLS),y)
 	INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-full
 	INTL_FULL:=1
 
+	CMAKE_OPTIONS += -DCMAKE_PREFIX_PATH="$(ICONV_PREFIX);$(INTL_PREFIX)"
 else
 	ICONV_PREFIX:=
 	ICONV_FULL:=




More information about the lede-commits mailing list