testing/make
SHA256
3
0
Fork 0
forked from pool/make
Code Pull Requests Activity

Accepting request 156218 from Base:System

Browse Source 
- Fix missing definition of PAGE_SIZE (forwarded request 155704 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/156218
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/make?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2013-02-26 14:22:19 +00:00 committed by Git OBS Bridge
commit 90a9463881
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
make-arglength.patch
View File

@ -1,7 +1,8 @@
diff -u make-3.82-orig/configure.in make-3.82/configure.in Index: make-3.82/configure.in
--- make-3.82-orig/configure.in 2010-07-28 07:39:50.000000000 +0200 ===================================================================
+++ make-3.82/configure.in 2012-03-21 12:34:20.000000000 +0100 --- make-3.82.orig/configure.in
@@ -64,7 +64,8 @@ +++ make-3.82/configure.in
@@ -64,7 +64,8 @@ AC_HEADER_DIRENT
AC_HEADER_STAT AC_HEADER_STAT
AC_HEADER_TIME AC_HEADER_TIME
AC_CHECK_HEADERS(stdlib.h locale.h unistd.h limits.h fcntl.h string.h \ AC_CHECK_HEADERS(stdlib.h locale.h unistd.h limits.h fcntl.h string.h \
@ -11,24 +12,26 @@ diff -u make-3.82-orig/configure.in make-3.82/configure.in
# Set a flag if we have an ANSI C compiler # Set a flag if we have an ANSI C compiler
if test "$ac_cv_prog_cc_stdc" != no; then if test "$ac_cv_prog_cc_stdc" != no; then
Subdirectorios comunes: make-3.82-orig/doc y make-3.82/doc Index: make-3.82/job.c
Subdirectorios comunes: make-3.82-orig/glob y make-3.82/glob ===================================================================
diff -u make-3.82-orig/job.c make-3.82/job.c --- make-3.82.orig/job.c
--- make-3.82-orig/job.c 2010-07-24 10:27:50.000000000 +0200 +++ make-3.82/job.c
+++ make-3.82/job.c 2012-03-21 12:34:20.000000000 +0100 @@ -29,6 +29,14 @@ this program. If not, see <http://www.g
@@ -29,6 +29,11 @@
#include <string.h> #include <string.h>
+#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) +#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H)
+#include <sys/user.h> +#include <sys/user.h>
+#include <linux/binfmts.h> +#include <linux/binfmts.h>
+#ifndef PAGE_SIZE
+#define PAGE_SIZE getpagesize()
+#endif
+#endif +#endif
+ +
/* Default shell to use. */ /* Default shell to use. */
#ifdef WINDOWS32 #ifdef WINDOWS32
#include <windows.h> #include <windows.h>
@@ -2795,6 +2800,7 @@ @@ -2795,6 +2803,7 @@ construct_command_argv_internal (char *l
unsigned int sflags_len = strlen (shellflags); unsigned int sflags_len = strlen (shellflags);
char *command_ptr = NULL; /* used for batch_mode_shell mode */ char *command_ptr = NULL; /* used for batch_mode_shell mode */
char *new_line; char *new_line;
@ -36,7 +39,7 @@ diff -u make-3.82-orig/job.c make-3.82/job.c
# ifdef __EMX__ /* is this necessary? */ # ifdef __EMX__ /* is this necessary? */
if (!unixy_shell) if (!unixy_shell)
@@ -2865,8 +2871,17 @@ @@ -2865,8 +2874,17 @@ construct_command_argv_internal (char *l
return new_argv; return new_argv;
} }
@ -55,7 +58,7 @@ diff -u make-3.82-orig/job.c make-3.82/job.c
ap = new_line; ap = new_line;
memcpy (ap, shell, shell_len); memcpy (ap, shell, shell_len);
ap += shell_len; ap += shell_len;
@@ -2875,6 +2890,30 @@ @@ -2875,6 +2893,30 @@ construct_command_argv_internal (char *l
ap += sflags_len; ap += sflags_len;
*(ap++) = ' '; *(ap++) = ' ';
command_ptr = ap; command_ptr = ap;
@ -86,7 +89,7 @@ diff -u make-3.82-orig/job.c make-3.82/job.c
for (p = line; *p != '\0'; ++p) for (p = line; *p != '\0'; ++p)
{ {
if (restp != NULL && *p == '\n') if (restp != NULL && *p == '\n')
@@ -2922,6 +2961,14 @@ @@ -2922,6 +2964,14 @@ construct_command_argv_internal (char *l
} }
#endif #endif
*ap++ = *p; *ap++ = *p;
@ -101,5 +104,3 @@ diff -u make-3.82-orig/job.c make-3.82/job.c
} }
if (ap == new_line + shell_len + sflags_len + 2) if (ap == new_line + shell_len + sflags_len + 2)
/* Line was empty. */ /* Line was empty. */

5
make.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 15 10:39:32 UTC 2013 - schwab@suse.de
- Fix missing definition of PAGE_SIZE
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 2 15:26:19 UTC 2013 - dmueller@suse.com Sat Feb 2 15:26:19 UTC 2013 - dmueller@suse.com