summaryrefslogtreecommitdiffstats
path: root/source/d
diff options
context:
space:
mode:
Diffstat (limited to 'source/d')
-rw-r--r--source/d/make/make-4.0-noclock_gettime.patch14
-rw-r--r--source/d/make/make-4.3-getcwd.patch12
-rw-r--r--source/d/make/make-4.3-j8k.patch25
-rwxr-xr-xsource/d/make/make.SlackBuild11
4 files changed, 2 insertions, 60 deletions
diff --git a/source/d/make/make-4.0-noclock_gettime.patch b/source/d/make/make-4.0-noclock_gettime.patch
deleted file mode 100644
index f63e1fc7c..000000000
--- a/source/d/make/make-4.0-noclock_gettime.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up make-3.82/configure\~ make-3.82/configure
---- make-3.82/configure~ 2010-07-28 07:41:51.000000000 +0200
-+++ make-3.82/configure 2010-08-11 15:07:50.000000000 +0200
-@@ -7215,7 +7215,7 @@ return clock_gettime ();
- return 0;
- }
- _ACEOF
--for ac_lib in '' rt posix4; do
-+for ac_lib in '' posix4; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
-
-Diff finished. Wed Aug 11 15:07:59 2010
diff --git a/source/d/make/make-4.3-getcwd.patch b/source/d/make/make-4.3-getcwd.patch
deleted file mode 100644
index 7f6f18fa9..000000000
--- a/source/d/make/make-4.3-getcwd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrup a/src/makeint.h b/src/makeint.h
---- a/src/makeint.h 2016-05-21 16:22:32.000000000 -0400
-+++ b/src/makeint.h 2016-09-22 16:12:38.606702160 -0400
-@@ -596,7 +596,7 @@ long int lseek ();
- # endif
-
- # ifdef HAVE_GETCWD
--# if !defined(VMS) && !defined(__DECC)
-+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
- char *getcwd ();
- # endif
- # else
diff --git a/source/d/make/make-4.3-j8k.patch b/source/d/make/make-4.3-j8k.patch
deleted file mode 100644
index 60a0c7fba..000000000
--- a/source/d/make/make-4.3-j8k.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nrup a/src/main.c b/src/main.c
---- a/src/main.c 2016-05-31 03:17:26.000000000 -0400
-+++ b/src/main.c 2016-09-22 16:18:52.283889265 -0400
-@@ -2051,6 +2051,21 @@ main (int argc, char **argv, char **envp
- }
- #endif
-
-+#ifdef PIPE_BUF
-+ if (job_slots > PIPE_BUF)
-+#elif defined _POSIX_PIPE_BUF
-+ if (job_slots > _POSIX_PIPE_BUF)
-+#else
-+ if (job_slots > 512)
-+#endif
-+ {
-+ O (error, NILF,
-+ _("More parallel jobs (-jN) than this platform can handle requested."));
-+ O (error, NILF, _("Resetting to single job (-j1) mode."));
-+ job_slots = 1;
-+ }
-+
-+
- /* If we have >1 slot at this point, then we're a top-level make.
- Set up the jobserver.
-
diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild
index adc0ccaa9..dfce383db 100755
--- a/source/d/make/make.SlackBuild
+++ b/source/d/make/make.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2005-2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=make
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -77,13 +77,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Patches from Fedora:
-zcat $CWD/make-4.0-noclock_gettime.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/make-4.3-getcwd.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/make-4.3-j8k.patch.gz | patch -p1 --verbose || exit 1
-
-autoreconf -vif
-
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \