浏览代码

make: bump to version 4.0

This commit bumps make to version 4.0. This version now uses fork(),
so it is no longer available on non-MMU platforms, which consequently
works around:

  http://autobuild.buildroot.org/results/2e1/2e1b11ccb501f1ab431c04435be52a6538d035cb/

The glob special options seem to no longer be needed, at least make
4.0 builds fine with both an ARM uClibc toolchain and an ARM glibc
toolchain.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni 11 年之前
父节点
当前提交
1aa42ad4ae
共有 3 个文件被更改,包括 3 次插入5 次删除
  1. 1 0
      package/make/Config.in
  2. 1 5
      package/make/make.mk
  3. 1 0
      package/uclibc/Config.in

+ 1 - 0
package/make/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_MAKE
 config BR2_PACKAGE_MAKE
 	bool "make"
 	bool "make"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	help
 	  A tool which controls the generation of executables and other
 	  A tool which controls the generation of executables and other

+ 1 - 5
package/make/make.mk

@@ -4,7 +4,7 @@
 #
 #
 ################################################################################
 ################################################################################
 
 
-MAKE_VERSION = 3.82
+MAKE_VERSION = 4.0
 MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
 MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
 MAKE_SITE = $(BR2_GNU_MIRROR)/make
 MAKE_SITE = $(BR2_GNU_MIRROR)/make
 MAKE_LICENSE = GPLv3+
 MAKE_LICENSE = GPLv3+
@@ -12,8 +12,4 @@ MAKE_LICENSE_FILES = COPYING
 
 
 MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 
-MAKE_CONF_ENV = make_cv_sys_gnu_glob=no \
-		GLOBINC='-I$(@D)/glob' \
-		GLOBLIB=glob/libglob.a
-
 $(eval $(autotools-package))
 $(eval $(autotools-package))

+ 1 - 0
package/uclibc/Config.in

@@ -157,6 +157,7 @@ config BR2_UCLIBC_INSTALL_UTILS
 config BR2_UCLIBC_INSTALL_TEST_SUITE
 config BR2_UCLIBC_INSTALL_TEST_SUITE
 	bool "Compile and install uClibc tests"
 	bool "Compile and install uClibc tests"
 	select BR2_PACKAGE_MAKE
 	select BR2_PACKAGE_MAKE
+	depends on BR2_USE_MMU # make
 	help
 	help
 	  Enabling this option will compile and install the uClibc test suite.
 	  Enabling this option will compile and install the uClibc test suite.
 	  This is useful if you want to check if the uClibc library is working
 	  This is useful if you want to check if the uClibc library is working