From 5aaa3fb967c3767be5c6bf45376041150ad2d423 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 4 Nov 2017 01:00:39 +0100 Subject: [PATCH] make: replace 4.2 with 4.2.1. * 4.1 stays the active version because 4.2.1 still doesn't behave correctly with parallel builds. --- .../make/{make-4.2.recipe => make-4.2.1.recipe} | 12 ++---------- .../{make-4.2.patchset => make-4.2.1.patchset} | 0 2 files changed, 2 insertions(+), 10 deletions(-) rename sys-devel/make/{make-4.2.recipe => make-4.2.1.recipe} (71%) rename sys-devel/make/patches/{make-4.2.patchset => make-4.2.1.patchset} (100%) diff --git a/sys-devel/make/make-4.2.recipe b/sys-devel/make/make-4.2.1.recipe similarity index 71% rename from sys-devel/make/make-4.2.recipe rename to sys-devel/make/make-4.2.1.recipe index bb2cc8974..e20c66f3a 100644 --- a/sys-devel/make/make-4.2.recipe +++ b/sys-devel/make/make-4.2.1.recipe @@ -10,11 +10,8 @@ COPYRIGHT="1988-2016 Free Software Foundation, Inc." LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="http://ftpmirror.gnu.org/make/make-$portVersion.tar.bz2" -CHECKSUM_SHA256="4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f" +CHECKSUM_SHA256="d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" PATCHES="make-$portVersion.patchset" -SOURCE_FILENAME_2="make-4.1-fix_double_colon_rules_plus_parallel_builds.patch" -SOURCE_URI_2="https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-devel/make/files/$SOURCE_FILENAME_2?id=aca8dbccd491139f8d0f8a6fcb690f7780933cf2#noarchive" -CHECKSUM_SHA256_2="8186ff3732ae1384e5cba27dfedf68af6994c4bf048804b337db74a6428d4eb6" ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64 ?arm" @@ -45,15 +42,10 @@ fi defineDebugInfoPackage make \ $binDir/make -PATCH() -{ - patch --reverse -p1 -i $sourceDir2/$SOURCE_FILENAME_2 -} - BUILD() { runConfigure ./configure \ - --disable-rpath --with-gnu-ld + --disable-rpath --with-gnu-ld --disable-dependency-tracking ./build.sh } diff --git a/sys-devel/make/patches/make-4.2.patchset b/sys-devel/make/patches/make-4.2.1.patchset similarity index 100% rename from sys-devel/make/patches/make-4.2.patchset rename to sys-devel/make/patches/make-4.2.1.patchset