From: Daniel Golle Date: Thu, 5 Nov 2020 00:30:04 +0000 (+0000) Subject: gdb: fix building with NLS enabled X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4a976beff45865d889a3a914a1ef2221400142fa;p=openwrt%2Fstaging%2Fzorun.git gdb: fix building with NLS enabled Building gdb failed with CONFIG_BUILD_NLS enabled. Use nls.mk and add the necessary dependencies for libintl and libiconv. Signed-off-by: Daniel Golle --- diff --git a/package/devel/gdb/Makefile b/package/devel/gdb/Makefile index e824f09e8f..17b2bb8481 100644 --- a/package/devel/gdb/Makefile +++ b/package/devel/gdb/Makefile @@ -21,11 +21,12 @@ PKG_LICENSE:=GPL-3.0+ PKG_CPE_ID:=cpe:/a:gnu:gdb include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk define Package/gdb/Default SECTION:=devel CATEGORY:=Development - DEPENDS:=+!USE_MUSL:libthread-db +zlib + DEPENDS:=+!USE_MUSL:libthread-db $(ICONV_DEPENDS) $(INTL_DEPENDS) URL:=https://www.gnu.org/software/gdb/ endef @@ -44,7 +45,7 @@ endef define Package/gdbserver $(call Package/gdb/Default) TITLE:=Remote server for GNU Debugger - DEPENDS=@!arc + DEPENDS+=@!arc endef define Package/gdbserver/description @@ -68,6 +69,7 @@ CONFIGURE_VARS+= \ ac_cv_search_tgetent="$(TARGET_LDFLAGS) -lncurses -lreadline" TARGET_LDFLAGS+= \ + $(INTL_LDFLAGS) $(if $(INTL_FULL),-lintl) \ -static-libstdc++ \ -Wl,--gc-sections