From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Jan 2015 14:30:22 +0000 (-0300)
Subject: m4: remove deprecated target package
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6927bc9150a8304ce6c059ae904d9fa6a8fea4ca;p=buildroot.git

m4: remove deprecated target package

It's been deprecated for a year now so remove the target variant.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/Config.in.legacy b/Config.in.legacy
index d6f32a0741..a8c5dabef2 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -102,6 +102,13 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_M4
+	bool "m4 target package removed"
+	select BR2_LEGACY
+	help
+	  The m4 target package has been removed, it's been
+	  deprecated for some time now.
+
 config BR2_PACKAGE_FLEX_BINARY
 	bool "flex binary in target option removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 2dc0ac654b..127ced341f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -123,7 +123,6 @@ endif
 	source "package/intltool/Config.in"
 	source "package/jq/Config.in"
 	source "package/libtool/Config.in"
-	source "package/m4/Config.in"
 	source "package/make/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/patch/Config.in"
diff --git a/package/m4/Config.in b/package/m4/Config.in
deleted file mode 100644
index e2ce5b3ed6..0000000000
--- a/package/m4/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_M4
-	bool "m4"
-	depends on BR2_USE_WCHAR
-	# uses fork()
-	depends on BR2_USE_MMU
-	# development tool, useless on the target
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	help
-	  An implementation of the traditional Unix macro processor.
-
-	  http://www.gnu.org/software/m4/m4.html
-
-comment "m4 needs a toolchain w/ wchar"
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index 32dfef4923..9b5d2d1fa9 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -9,13 +9,6 @@ M4_SOURCE = m4-$(M4_VERSION).tar.xz
 M4_SITE = $(BR2_GNU_MIRROR)/m4
 M4_LICENSE = GPLv3+
 M4_LICENSE_FILES = COPYING
-M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no
-
-ifneq ($(BR2_USE_WCHAR),y)
-M4_CONF_ENV += gt_cv_c_wchar_t=no gl_cv_absolute_wchar_h=__fpending.h
-endif
-
 HOST_M4_CONF_OPTS = --disable-static
 
-$(eval $(autotools-package))
 $(eval $(host-autotools-package))