Update to make-4.4.1.
This commit is contained in:
parent
bbc6285588
commit
ef98f7cdf8
|
@ -1,40 +1,28 @@
|
||||||
diff -Paur --no-dereference -- make.upstream/config/config.sub make/config/config.sub
|
diff -Paur --no-dereference -- make.upstream/src/dir.c make/src/dir.c
|
||||||
--- make.upstream/config/config.sub
|
--- make.upstream/src/dir.c
|
||||||
+++ make/config/config.sub
|
+++ make/src/dir.c
|
||||||
@@ -1356,7 +1356,7 @@
|
@@ -20,6 +20,8 @@
|
||||||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
|
||||||
| -sym* | -kopensolaris* | -plan9* \
|
|
||||||
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
|
||||||
- | -aos* | -aros* \
|
|
||||||
+ | -aos* | -aros* | -sortix* \
|
|
||||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
|
||||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
|
||||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
|
||||||
diff -Paur --no-dereference -- make.upstream/dir.c make/dir.c
|
|
||||||
--- make.upstream/dir.c
|
|
||||||
+++ make/dir.c
|
|
||||||
@@ -19,6 +19,8 @@
|
|
||||||
#include "filedef.h"
|
|
||||||
#include "dep.h"
|
#include "dep.h"
|
||||||
|
#include "debug.h"
|
||||||
|
|
||||||
+#include <stddef.h>
|
+#include <stddef.h>
|
||||||
+
|
+
|
||||||
#ifdef HAVE_DIRENT_H
|
#ifdef HAVE_DIRENT_H
|
||||||
# include <dirent.h>
|
# include <dirent.h>
|
||||||
# define NAMLEN(dirent) strlen((dirent)->d_name)
|
# define NAMLEN(dirent) strlen((dirent)->d_name)
|
||||||
@@ -1142,7 +1144,7 @@
|
@@ -1253,7 +1255,7 @@
|
||||||
/* The glob interface wants a 'struct dirent', so mock one up. */
|
/* The glob interface wants a 'struct dirent', so mock one up. */
|
||||||
struct dirent *d;
|
struct dirent *d;
|
||||||
unsigned int len = df->length + 1;
|
size_t len = df->length + 1;
|
||||||
- unsigned int sz = sizeof (*d) - sizeof (d->d_name) + len;
|
- size_t sz = sizeof (*d) - sizeof (d->d_name) + len;
|
||||||
+ unsigned int sz = offsetof(struct dirent, d_name) + len;
|
+ size_t sz = offsetof(struct dirent, d_name) + len;
|
||||||
if (sz > bufsz)
|
if (sz > bufsz)
|
||||||
{
|
{
|
||||||
bufsz *= 2;
|
bufsz *= 2;
|
||||||
diff -Paur --no-dereference -- make.upstream/function.c make/function.c
|
diff -Paur --no-dereference -- make.upstream/src/function.c make/src/function.c
|
||||||
--- make.upstream/function.c
|
--- make.upstream/src/function.c
|
||||||
+++ make/function.c
|
+++ make/src/function.c
|
||||||
@@ -2095,27 +2095,23 @@
|
@@ -2279,36 +2279,23 @@
|
||||||
char *rp;
|
char *rp;
|
||||||
struct stat st;
|
struct stat st;
|
||||||
PATH_VAR (in);
|
PATH_VAR (in);
|
||||||
|
@ -45,6 +33,15 @@ diff -Paur --no-dereference -- make.upstream/function.c make/function.c
|
||||||
|
|
||||||
-#ifdef HAVE_REALPATH
|
-#ifdef HAVE_REALPATH
|
||||||
- ENULLLOOP (rp, realpath (in, out));
|
- ENULLLOOP (rp, realpath (in, out));
|
||||||
|
-# if defined _AIX
|
||||||
|
- /* AIX realpath() doesn't remove trailing slashes correctly. */
|
||||||
|
- if (rp)
|
||||||
|
- {
|
||||||
|
- char *ep = rp + strlen (rp) - 1;
|
||||||
|
- while (ep > rp && ep[0] == '/')
|
||||||
|
- *(ep--) = '\0';
|
||||||
|
- }
|
||||||
|
-# endif
|
||||||
-#else
|
-#else
|
||||||
- rp = abspath (in, out);
|
- rp = abspath (in, out);
|
||||||
-#endif
|
-#endif
|
||||||
|
@ -66,40 +63,25 @@ diff -Paur --no-dereference -- make.upstream/function.c make/function.c
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff -Paur --no-dereference -- make.upstream/getloadavg.c make/getloadavg.c
|
diff -Paur --no-dereference -- make.upstream/src/job.c make/src/job.c
|
||||||
--- make.upstream/getloadavg.c
|
--- make.upstream/src/job.c
|
||||||
+++ make/getloadavg.c
|
+++ make/src/job.c
|
||||||
@@ -78,9 +78,11 @@
|
@@ -74,6 +74,11 @@
|
||||||
/* Both the Emacs and non-Emacs sections want this. Some
|
# define VMS_POSIX_EXIT_MASK (C_FACILITY_NO | 0xA000)
|
||||||
configuration files' definitions for the LOAD_AVE_CVT macro (like
|
|
||||||
sparc.h's) use macros like FSCALE, defined here. */
|
|
||||||
+#ifdef HAVE_SYS_PARAM_H
|
|
||||||
#if defined (unix) || defined (__unix)
|
|
||||||
# include <sys/param.h>
|
|
||||||
#endif
|
#endif
|
||||||
+#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Exclude all the code except the test program at the end
|
|
||||||
diff -Paur --no-dereference -- make.upstream/job.c make/job.c
|
|
||||||
--- make.upstream/job.c
|
|
||||||
+++ make/job.c
|
|
||||||
@@ -67,6 +67,11 @@
|
|
||||||
char default_shell[] = "";
|
|
||||||
int batch_mode_shell = 0;
|
|
||||||
|
|
||||||
+#elif defined (__sortix__)
|
+#elif defined (__sortix__)
|
||||||
+
|
+
|
||||||
+char default_shell[] = "sh";
|
+char const *default_shell = "sh";
|
||||||
+int batch_mode_shell = 0;
|
+int batch_mode_shell = 0;
|
||||||
+
|
+
|
||||||
#else
|
#else
|
||||||
|
|
||||||
char default_shell[] = "/bin/sh";
|
const char *default_shell = "/bin/sh";
|
||||||
diff -Paur --no-dereference -- make.upstream/main.c make/main.c
|
diff -Paur --no-dereference -- make.upstream/src/main.c make/src/main.c
|
||||||
--- make.upstream/main.c
|
--- make.upstream/src/main.c
|
||||||
+++ make/main.c
|
+++ make/src/main.c
|
||||||
@@ -2393,9 +2393,9 @@
|
@@ -2768,9 +2768,9 @@
|
||||||
if (restarts)
|
if (restarts)
|
||||||
{
|
{
|
||||||
char *b = alloca (40);
|
char *b = alloca (40);
|
||||||
|
@ -111,10 +93,10 @@ diff -Paur --no-dereference -- make.upstream/main.c make/main.c
|
||||||
}
|
}
|
||||||
|
|
||||||
fflush (stdout);
|
fflush (stdout);
|
||||||
diff -Paur --no-dereference -- make.upstream/misc.c make/misc.c
|
diff -Paur --no-dereference -- make.upstream/src/misc.c make/src/misc.c
|
||||||
--- make.upstream/misc.c
|
--- make.upstream/src/misc.c
|
||||||
+++ make/misc.c
|
+++ make/src/misc.c
|
||||||
@@ -710,6 +710,9 @@
|
@@ -877,6 +877,9 @@
|
||||||
unsigned int
|
unsigned int
|
||||||
get_path_max (void)
|
get_path_max (void)
|
||||||
{
|
{
|
||||||
|
@ -124,46 +106,46 @@ diff -Paur --no-dereference -- make.upstream/misc.c make/misc.c
|
||||||
static unsigned int value;
|
static unsigned int value;
|
||||||
|
|
||||||
if (value == 0)
|
if (value == 0)
|
||||||
@@ -722,5 +725,6 @@
|
@@ -889,6 +892,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
return value;
|
return value;
|
||||||
+#endif
|
+#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
diff -Paur --no-dereference -- make.upstream/output.c make/output.c
|
|
||||||
--- make.upstream/output.c
|
|
||||||
+++ make/output.c
|
|
||||||
@@ -278,6 +278,10 @@
|
|
||||||
static void *
|
|
||||||
acquire_semaphore (void)
|
|
||||||
{
|
|
||||||
+#if defined(__sortix__)
|
|
||||||
+ static int foo;
|
|
||||||
+ return &foo;
|
|
||||||
+#else
|
|
||||||
static struct flock fl;
|
|
||||||
|
|
||||||
fl.l_type = F_WRLCK;
|
diff -Paur --no-dereference -- make.upstream/src/posixos.c make/src/posixos.c
|
||||||
@@ -288,16 +292,21 @@
|
--- make.upstream/src/posixos.c
|
||||||
return &fl;
|
+++ make/src/posixos.c
|
||||||
perror ("fcntl()");
|
@@ -722,6 +722,7 @@
|
||||||
return NULL;
|
{
|
||||||
|
if (osync_enabled())
|
||||||
|
{
|
||||||
|
+#ifdef F_SETLKW
|
||||||
|
struct flock fl;
|
||||||
|
|
||||||
|
fl.l_type = F_WRLCK;
|
||||||
|
@@ -734,6 +735,7 @@
|
||||||
|
perror ("fcntl()");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
+#endif
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
@@ -744,6 +746,7 @@
|
||||||
|
{
|
||||||
|
if (osync_enabled())
|
||||||
|
{
|
||||||
|
+#ifdef F_SETLKW
|
||||||
|
struct flock fl;
|
||||||
|
|
||||||
|
fl.l_type = F_UNLCK;
|
||||||
|
@@ -753,6 +756,7 @@
|
||||||
|
/* We don't want to keep waiting on EINTR. */
|
||||||
|
if (fcntl (osync_handle, F_SETLKW, &fl) == -1)
|
||||||
|
perror ("fcntl()");
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Release the lock for writing output. */
|
|
||||||
static void
|
|
||||||
release_semaphore (void *sem)
|
|
||||||
{
|
|
||||||
+#if defined(__sortix__)
|
|
||||||
+ (void) sem;
|
|
||||||
+#else
|
|
||||||
struct flock *flp = (struct flock *)sem;
|
|
||||||
flp->l_type = F_UNLCK;
|
|
||||||
if (fcntl (sync_handle, F_SETLKW, flp) == -1)
|
|
||||||
perror ("fcntl()");
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Returns a file descriptor to a temporary file. The file is automatically
|
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
NAME=make
|
NAME=make
|
||||||
BUILD_LIBRARIES='libiconv? libintl?'
|
BUILD_LIBRARIES='libiconv? libintl?'
|
||||||
VERSION=4.0
|
VERSION=4.4.1
|
||||||
DISTNAME=$NAME-$VERSION
|
DISTNAME=$NAME-$VERSION
|
||||||
COMPRESSION=tar.bz2
|
COMPRESSION=tar.gz
|
||||||
ARCHIVE=$DISTNAME.$COMPRESSION
|
ARCHIVE=$DISTNAME.$COMPRESSION
|
||||||
SHA256SUM=e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb
|
SHA256SUM=dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3
|
||||||
UPSTREAM_SITE=https://ftp.gnu.org/gnu/make
|
UPSTREAM_SITE=https://ftp.gnu.org/gnu/make
|
||||||
UPSTREAM_ARCHIVE=$ARCHIVE
|
UPSTREAM_ARCHIVE=$ARCHIVE
|
||||||
BUILD_SYSTEM=configure
|
BUILD_SYSTEM=configure
|
||||||
|
LICENSE=GPL-3.0-or-later
|
||||||
POST_INSTALL=../make.post-install
|
POST_INSTALL=../make.post-install
|
||||||
|
|
Loading…
Reference in New Issue