summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/make
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/make')
-rw-r--r--meta/recipes-devtools/make/files/SCCS.patch17
-rw-r--r--meta/recipes-devtools/make/make.inc8
-rw-r--r--meta/recipes-devtools/make/make_3.82.bb8
-rw-r--r--meta/recipes-devtools/make/make_4.2.1.bb12
4 files changed, 15 insertions, 30 deletions
diff --git a/meta/recipes-devtools/make/files/SCCS.patch b/meta/recipes-devtools/make/files/SCCS.patch
deleted file mode 100644
index c7ec3bd07f..0000000000
--- a/meta/recipes-devtools/make/files/SCCS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- make-3.80/configure.in~SCCS
-+++ make-3.80/configure.in
-@@ -264,7 +264,7 @@
- [Define this if the SCCS 'get' command understands the '-G<file>' option.]);;
- esac
- fi
--rm -f s.conftest conftoast
-+rm -f s.conftest conftoast SCCS/*s.conftest
-
- # Check the system to see if it provides GNU glob. If not, use our
- # local version.
diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc
index 5c52c2ad63..849b74299c 100644
--- a/meta/recipes-devtools/make/make.inc
+++ b/meta/recipes-devtools/make/make.inc
@@ -4,11 +4,9 @@ program from the program's source files. Make gets its knowledge of how to buil
called the makefile, which lists each of the non-source files and how to compute it from other files."
HOMEPAGE = "http://www.gnu.org/software/make/"
SECTION = "devel"
-LICENSE = "GPL"
-SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
- file://SCCS.patch"
+SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2"
-inherit autotools gettext
+inherit autotools gettext pkgconfig texinfo
-BBCLASSEXTEND = "native"
+PROVIDES = "virtual/make"
diff --git a/meta/recipes-devtools/make/make_3.82.bb b/meta/recipes-devtools/make/make_3.82.bb
deleted file mode 100644
index 61fbb324d1..0000000000
--- a/meta/recipes-devtools/make/make_3.82.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-PR = "r0"
-LICENSE="GPLv3&LGPLv2"
-LIC_FILES_CHKSUM = "file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
- file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
-require make.inc
-
-SRC_URI[md5sum] = "1a11100f3c63fcf5753818e59d63088f"
-SRC_URI[sha256sum] = "e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"
diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb
new file mode 100644
index 0000000000..c6e6a0cd58
--- /dev/null
+++ b/meta/recipes-devtools/make/make_4.2.1.bb
@@ -0,0 +1,12 @@
+LICENSE = "GPLv3 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+ file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+ file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
+require make.inc
+
+EXTRA_OECONF += "--without-guile"
+
+SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac"
+SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589"
+
+BBCLASSEXTEND = "native nativesdk"