Attachment 213540 Details for Bug 245725 – patch

[patch] patch

gmake.patch (text/plain), 10.49 KB, created by Tijl Coosemans on 2020-04-18 15:27:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2020-04-18 15:27:54 UTC

Size: 10.49 KB

patch

obsolete

>Index: devel/gmake/Makefile
>===================================================================
>--- devel/gmake/Makefile	(revision 532033)
>+++ devel/gmake/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gmake
>-PORTVERSION=	4.2.1
>-PORTREVISION=	3
>+PORTVERSION=	4.3
> CATEGORIES=	devel
> MASTER_SITES=	GNU/make
> DISTNAME=	make-${PORTVERSION}
>@@ -21,7 +20,7 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--program-prefix=g \
> 		--without-guile
> 
>-USES=		cpe tar:bzip2
>+USES=		cpe tar:lz
> CPE_VENDOR=	gnu
> 
> OPTIONS_DEFINE=	NLS
>Index: devel/gmake/distinfo
>===================================================================
>--- devel/gmake/distinfo	(revision 532033)
>+++ devel/gmake/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1465732758
>-SHA256 (make-4.2.1.tar.bz2) = d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
>-SIZE (make-4.2.1.tar.bz2) = 1407126
>+TIMESTAMP = 1587222848
>+SHA256 (make-4.3.tar.lz) = de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82
>+SIZE (make-4.3.tar.lz) = 1266180
>Index: devel/gmake/files/patch-default.c
>===================================================================
>--- devel/gmake/files/patch-default.c	(revision 532033)
>+++ devel/gmake/files/patch-default.c	(nonexistent)
>@@ -1,11 +0,0 @@
>---- default.c.orig	2015-05-13 16:16:24 UTC
>-+++ default.c
>-@@ -447,7 +447,7 @@ static const char *default_variables[] =
>-     "OBJC", "gcc",
>- #else
>-     "CC", "cc",
>--    "CXX", "g++",
>-+    "CXX", "c++",
>-     "OBJC", "cc",
>- #endif
>- 
>
>Property changes on: devel/gmake/files/patch-default.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/gmake/files/patch-glob-glob.c
>===================================================================
>--- devel/gmake/files/patch-glob-glob.c	(revision 532033)
>+++ devel/gmake/files/patch-glob-glob.c	(nonexistent)
>@@ -1,10 +0,0 @@
>---- glob/glob.c.orig	2013-10-20 17:14:38 UTC
>-+++ glob/glob.c
>-@@ -203,7 +203,6 @@ my_realloc (p, n)
>-     return (char *) malloc (n);
>-   return (char *) realloc (p, n);
>- }
>--# define	realloc	my_realloc
>- # endif /* __SASC */
>- #endif /* __GNU_LIBRARY__ || __DJGPP__ */
>- 
>
>Property changes on: devel/gmake/files/patch-glob-glob.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/gmake/files/patch-lib-glob.c
>===================================================================
>--- devel/gmake/files/patch-lib-glob.c	(nonexistent)
>+++ devel/gmake/files/patch-lib-glob.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- lib/glob.c.orig	2020-01-03 07:11:27 UTC
>++++ lib/glob.c
>+@@ -203,7 +203,6 @@ my_realloc (p, n)
>+     return (char *) malloc (n);
>+   return (char *) realloc (p, n);
>+ }
>+-# define	realloc	my_realloc
>+ # endif /* __SASC */
>+ #endif /* __GNU_LIBRARY__ || __DJGPP__ */
>+ 
>
>Property changes on: devel/gmake/files/patch-lib-glob.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/gmake/files/patch-posixos.c
>===================================================================
>--- devel/gmake/files/patch-posixos.c	(revision 532033)
>+++ devel/gmake/files/patch-posixos.c	(nonexistent)
>@@ -1,170 +0,0 @@
>-From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001
>-From: Paul Smith <psmith@gnu.org>
>-Date: Sat, 3 Jun 2017 16:20:51 -0400
>-Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs.
>-
>-* posixos.c (set_blocking): Set blocking on a file descriptor.
>-(jobserver_setup): Set non-blocking on the jobserver read side.
>-(jobserver_parse_auth): Ditto.
>-(jobserver_acquire_all): Set blocking to avoid a busy-wait loop.
>-(jobserver_acquire): If the non-blocking read() returns without
>-taking a token then try again.
>----
>- posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
>- 1 file changed, 71 insertions(+), 26 deletions(-)
>-
>-diff --git a/posixos.c b/posixos.c
>-index e642d7f..dbafa51 100644
>---- posixos.c
>-+++ posixos.c
>-@@ -62,6 +62,24 @@ make_job_rfd (void)
>- #endif
>- }
>- 
>-+static void
>-+set_blocking (int fd, int blocking)
>-+{
>-+  // If we're not using pselect() don't change the blocking
>-+#ifdef HAVE_PSELECT
>-+  int flags;
>-+  EINTRLOOP (flags, fcntl (fd, F_GETFL));
>-+  if (flags >= 0)
>-+    {
>-+      int r;
>-+      flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK);
>-+      EINTRLOOP (r, fcntl (fd, F_SETFL, flags));
>-+      if (r < 0)
>-+        pfatal_with_name ("fcntl(O_NONBLOCK)");
>-+    }
>-+#endif
>-+}
>-+
>- unsigned int
>- jobserver_setup (int slots)
>- {
>-@@ -86,6 +104,9 @@ jobserver_setup (int slots)
>-         pfatal_with_name (_("init jobserver pipe"));
>-     }
>- 
>-+  /* When using pselect() we want the read to be non-blocking.  */
>-+  set_blocking (job_fds[0], 0);
>-+
>-   return 1;
>- }
>- 
>-@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth)
>-       return 0;
>-     }
>- 
>-+  /* When using pselect() we want the read to be non-blocking.  */
>-+  set_blocking (job_fds[0], 0);
>-+
>-   return 1;
>- }
>- 
>-@@ -169,7 +193,10 @@ jobserver_acquire_all (void)
>- {
>-   unsigned int tokens = 0;
>- 
>--  /* Close the write side, so the read() won't hang.  */
>-+  /* Use blocking reads to wait for all outstanding jobs.  */
>-+  set_blocking (job_fds[0], 1);
>-+
>-+  /* Close the write side, so the read() won't hang forever.  */
>-   close (job_fds[1]);
>-   job_fds[1] = -1;
>- 
>-@@ -236,18 +263,12 @@ jobserver_pre_acquire (void)
>- unsigned int
>- jobserver_acquire (int timeout)
>- {
>--  sigset_t empty;
>--  fd_set readfds;
>-   struct timespec spec;
>-   struct timespec *specp = NULL;
>--  int r;
>--  char intake;
>-+  sigset_t empty;
>- 
>-   sigemptyset (&empty);
>- 
>--  FD_ZERO (&readfds);
>--  FD_SET (job_fds[0], &readfds);
>--
>-   if (timeout)
>-     {
>-       /* Alarm after one second (is this too granular?)  */
>-@@ -256,28 +277,52 @@ jobserver_acquire (int timeout)
>-       specp = &spec;
>-     }
>- 
>--  r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty);
>--
>--  if (r == -1)
>-+  while (1)
>-     {
>--      /* Better be SIGCHLD.  */
>--      if (errno != EINTR)
>--        pfatal_with_name (_("pselect jobs pipe"));
>--      return 0;
>--    }
>-+      fd_set readfds;
>-+      int r;
>-+      char intake;
>- 
>--  if (r == 0)
>--    /* Timeout.  */
>--    return 0;
>-+      FD_ZERO (&readfds);
>-+      FD_SET (job_fds[0], &readfds);
>- 
>--  /* The read FD is ready: read it!  */
>--  EINTRLOOP (r, read (job_fds[0], &intake, 1));
>--  if (r < 0)
>--    pfatal_with_name (_("read jobs pipe"));
>-+      r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty);
>-+      if (r < 0)
>-+        switch (errno)
>-+          {
>-+          case EINTR:
>-+            /* SIGCHLD will show up as an EINTR.  */
>-+            return 0;
>-+
>-+          case EBADF:
>-+            /* Someone closed the jobs pipe.
>-+               That shouldn't happen but if it does we're done.  */
>-+              O (fatal, NILF, _("job server shut down"));
>- 
>--  /* What does it mean if read() returns 0?  It shouldn't happen because only
>--     the master make can reap all the tokens and close the write side...??  */
>--  return r > 0;
>-+          default:
>-+            pfatal_with_name (_("pselect jobs pipe"));
>-+          }
>-+
>-+      if (r == 0)
>-+        /* Timeout.  */
>-+        return 0;
>-+
>-+      /* The read FD is ready: read it!  This is non-blocking.  */
>-+      EINTRLOOP (r, read (job_fds[0], &intake, 1));
>-+
>-+      if (r < 0)
>-+        {
>-+          /* Someone sniped our token!  Try again.  */
>-+          if (errno == EAGAIN)
>-+            continue;
>-+
>-+          pfatal_with_name (_("read jobs pipe"));
>-+        }
>-+
>-+      /* read() should never return 0: only the master make can reap all the
>-+         tokens and close the write side...??  */
>-+      return r > 0;
>-+    }
>- }
>- 
>- #else
>--- 
>-cgit v1.0-41-gc330
>-
>
>Property changes on: devel/gmake/files/patch-posixos.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/gmake/files/patch-src-default.c
>===================================================================
>--- devel/gmake/files/patch-src-default.c	(nonexistent)
>+++ devel/gmake/files/patch-src-default.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/default.c.orig	2020-01-03 07:11:27 UTC
>++++ src/default.c
>+@@ -530,7 +530,7 @@ static const char *default_variables[] =
>+     "OBJC", "gcc",
>+ #else
>+     "CC", "cc",
>+-    "CXX", "g++",
>++    "CXX", "c++",
>+     "OBJC", "cc",
>+ #endif
>+ 
>
>Property changes on: devel/gmake/files/patch-src-default.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/gmake/pkg-plist
>===================================================================
>--- devel/gmake/pkg-plist	(revision 532033)
>+++ devel/gmake/pkg-plist	(working copy)
>@@ -1,6 +1,7 @@
> bin/gmake
> include/gnumake.h
> %%NLS%%share/locale/be/LC_MESSAGES/make.mo
>+%%NLS%%share/locale/bg/LC_MESSAGES/make.mo
> %%NLS%%share/locale/cs/LC_MESSAGES/make.mo
> %%NLS%%share/locale/da/LC_MESSAGES/make.mo
> %%NLS%%share/locale/de/LC_MESSAGES/make.mo
>@@ -18,11 +19,14 @@ include/gnumake.h
> %%NLS%%share/locale/lt/LC_MESSAGES/make.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/make.mo
> %%NLS%%share/locale/pl/LC_MESSAGES/make.mo
>+%%NLS%%share/locale/pt/LC_MESSAGES/make.mo
> %%NLS%%share/locale/pt_BR/LC_MESSAGES/make.mo
> %%NLS%%share/locale/ru/LC_MESSAGES/make.mo
>+%%NLS%%share/locale/sr/LC_MESSAGES/make.mo
> %%NLS%%share/locale/sv/LC_MESSAGES/make.mo
> %%NLS%%share/locale/tr/LC_MESSAGES/make.mo
> %%NLS%%share/locale/uk/LC_MESSAGES/make.mo
> %%NLS%%share/locale/vi/LC_MESSAGES/make.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo
>+%%NLS%%share/locale/zh_TW/LC_MESSAGES/make.mo
> man/man1/gmake.1.gz

Actions: View | Diff

Attachments on bug 245725: 213540 | 213843 | 214196 | 214300