From a33802c993a5d866ae4304cae50e280a9c1da63c0ffc7489fa235a2dfcd559ae Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 23 Feb 2013 19:28:12 +0000
Subject: [PATCH] Accepting request 155704 from home:Andreas_Schwab:Factory

- Fix missing definition of PAGE_SIZE

OBS-URL: https://build.opensuse.org/request/show/155704
OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=29
---
 make-arglength.patch | 33 +++++++++++++++++----------------
 make.changes         |  5 +++++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/make-arglength.patch b/make-arglength.patch
index e28ca55..b0208cb 100644
--- a/make-arglength.patch
+++ b/make-arglength.patch
@@ -1,7 +1,8 @@
-diff -u make-3.82-orig/configure.in 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
-@@ -64,7 +64,8 @@
+Index: make-3.82/configure.in
+===================================================================
+--- make-3.82.orig/configure.in
++++ make-3.82/configure.in
+@@ -64,7 +64,8 @@ AC_HEADER_DIRENT
  AC_HEADER_STAT
  AC_HEADER_TIME
  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
  if test "$ac_cv_prog_cc_stdc" != no; then
-Subdirectorios comunes: make-3.82-orig/doc y make-3.82/doc
-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	2010-07-24 10:27:50.000000000 +0200
-+++ make-3.82/job.c	2012-03-21 12:34:20.000000000 +0100
-@@ -29,6 +29,11 @@
+Index: make-3.82/job.c
+===================================================================
+--- make-3.82.orig/job.c
++++ make-3.82/job.c
+@@ -29,6 +29,14 @@ this program.  If not, see <http://www.g
  
  #include <string.h>
  
 +#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H)
 +#include <sys/user.h>
 +#include <linux/binfmts.h>
++#ifndef PAGE_SIZE
++#define PAGE_SIZE getpagesize()
++#endif
 +#endif
 +
  /* Default shell to use.  */
  #ifdef WINDOWS32
  #include <windows.h>
-@@ -2795,6 +2800,7 @@
+@@ -2795,6 +2803,7 @@ construct_command_argv_internal (char *l
      unsigned int sflags_len = strlen (shellflags);
      char *command_ptr = NULL; /* used for batch_mode_shell mode */
      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? */
      if (!unixy_shell)
-@@ -2865,8 +2871,17 @@
+@@ -2865,8 +2874,17 @@ construct_command_argv_internal (char *l
  	return new_argv;
        }
  
@@ -55,7 +58,7 @@ diff -u make-3.82-orig/job.c make-3.82/job.c
      ap = new_line;
      memcpy (ap, shell, shell_len);
      ap += shell_len;
-@@ -2875,6 +2890,30 @@
+@@ -2875,6 +2893,30 @@ construct_command_argv_internal (char *l
      ap += sflags_len;
      *(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)
        {
  	if (restp != NULL && *p == '\n')
-@@ -2922,6 +2961,14 @@
+@@ -2922,6 +2964,14 @@ construct_command_argv_internal (char *l
            }
  #endif
  	*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)
        /* Line was empty.  */
-
-
diff --git a/make.changes b/make.changes
index 23e0979..08eec80 100644
--- a/make.changes
+++ b/make.changes
@@ -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