summaryrefslogtreecommitdiff
path: root/package/make
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-07-19 14:45:55 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-07-19 14:47:27 +0200
commit1aa42ad4aed013c03d1e17f4cfe2ace2194f423d (patch)
tree738f190fc882b594c9380cc367030eea15b5cd8c /package/make
parent64e95abe20d8468a4ba9e358d698bd81670d0887 (diff)
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>
Diffstat (limited to 'package/make')
-rw-r--r--package/make/Config.in1
-rw-r--r--package/make/make.mk6
2 files changed, 2 insertions, 5 deletions
diff --git a/package/make/Config.in b/package/make/Config.in
index aea72e31f4..f576b7b5a3 100644
--- a/package/make/Config.in
+++ b/package/make/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_MAKE
bool "make"
+ depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
A tool which controls the generation of executables and other
diff --git a/package/make/make.mk b/package/make/make.mk
index 74726e21e9..803595f026 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MAKE_VERSION = 3.82
+MAKE_VERSION = 4.0
MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
MAKE_SITE = $(BR2_GNU_MIRROR)/make
MAKE_LICENSE = GPLv3+
@@ -12,8 +12,4 @@ MAKE_LICENSE_FILES = COPYING
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))