diff --git a/Config.in.legacy b/Config.in.legacy index 9e8be3d14e..c6bb2fe342 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -101,6 +101,16 @@ endif ############################################################################### comment "Legacy options removed in 2014.08" +config BR2_PACKAGE_GETTEXT_TOOLS + bool "support for gettext-tools on target has been removed" + select BR2_LEGACY + help + The option to install the gettext utilities on the target + has been removed. This is not necessary as Buildroot is not + designed to provide a full development environment on the + target. gettext tools should be used on the build machine + instead. + config BR2_PACKAGE_PROCPS bool "procps has been replaced by procps-ng" select BR2_PACKAGE_PROCPS_NG diff --git a/package/gettext/Config.in b/package/gettext/Config.in index d33dd3a05f..158b14ebed 100644 --- a/package/gettext/Config.in +++ b/package/gettext/Config.in @@ -13,20 +13,6 @@ config BR2_PACKAGE_GETTEXT http://www.gnu.org/software/gettext/ -if BR2_PACKAGE_GETTEXT - -config BR2_PACKAGE_GETTEXT_TOOLS - bool "Install gettext tools" - depends on BR2_USE_MMU # fork() - depends on BR2_LARGEFILE - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - This option allows to install the complete gettext suite in - the target filesystem. This is typically not useful for - correct operation of programs. - -endif - comment "gettext needs a toolchain w/ wchar" depends on BR2_NEEDS_GETTEXT depends on !BR2_USE_WCHAR diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index b5efa766d3..52a72db716 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -46,16 +46,12 @@ ifeq ($(BR2_ENABLE_LOCALE),) GETTEXT_CONF_OPT += --enable-nls endif -# When the gettext tools are not enabled in the configuration, we only -# install libintl to the target. -ifeq ($(BR2_PACKAGE_GETTEXT_TOOLS),) # When static libs are preferred the .so files aren't created ifeq ($(BR2_PREFER_STATIC_LIB),) define GETTEXT_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/ endef endif -endif # GETTEXT_TOOLS = n # Disable interactive confirmation in host gettextize for package fixups define HOST_GETTEXT_GETTEXTIZE_CONFIRMATION