components/make/patches/33873.patch
author Drew Fisher <drew.fisher@oracle.com>
Mon, 31 Mar 2014 16:44:02 -0700
branchs11-update
changeset 3028 5e73a3a3f66a
parent 770 f112e7923000
permissions -rw-r--r--
PSARC/2013/350 OpenStack for Solaris (Umbrella) PSARC/2014/007 OpenStack client API components for Grizzly PSARC/2014/048 OpenStack Keystone (OpenStack Identity Service) PSARC/2014/049 OpenStack Nova (OpenStack Compute Service) PSARC/2014/054 OpenStack Cinder (OpenStack Block Storage Service) PSARC/2014/055 OpenStack Glance (OpenStack Image Service) PSARC/2014/058 OpenStack Horizon (OpenStack Dashboard) PSARC/2014/059 OpenStack Neutron (OpenStack Networking Service) 17531161 greenlet doesn't build with gcc 4.7.X 18143276 greenlet can crash with register window corruption on MP SPARC 18290089 integrate cinderclient 18290097 integrate glanceclient 18290102 integrate keystoneclient 18290109 integrate neutronclient 18290113 integrate novaclient 18290119 integrate swiftclient 18290125 integrate quantumclient 18307582 Request to integrate Cinder into userland 18307595 Request to integrate Glance into userland 18307626 Request to integrate Horizon into userland 18307641 Request to integrate Keystone into userland 18307650 Request to integrate Neutron into userland 18307659 Request to integrate Nova into userland 18321909 a few Python packages deliver both po and mo files 18362900 Dnsmasq's SMF method_credential is missing a privilege 18363793 Dnsmasq should use SIOCSXARP ioctl
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
770
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     1
This patch is taken from:
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     2
http://cvs.savannah.gnu.org/viewvc/make/main.c?root=make&r1=1.246&r2=1.247
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     3
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     4
When we re-exec the master makefile in a jobserver environment, ensure
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     5
that MAKEFLAGS is set properly so the re-exec'd make runs in parallel.
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     6
See Savannah bug #33873.
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     7
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     8
bug #33873: MAKEFLAGS=-jN gets lost on reexec
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     9
https://savannah.gnu.org/bugs/?33873
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    10
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    11
sr #107487: MAKEFLAGS not being honored always (regression) in 3.82
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    12
https://savannah.gnu.org/support/index.php?107487
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    13
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    14
--- a/main.c	2010/08/29 23:05:27	1.246
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    15
+++ b/main.c	2011/09/18 23:39:26	1.247
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    16
@@ -2088,6 +2088,11 @@
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    17
 
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    18
           ++restarts;
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    19
 
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    20
+          /* If we're re-exec'ing the first make, put back the number of
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    21
+             job slots so define_makefiles() will get it right.  */
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    22
+          if (master_job_slots)
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    23
+            job_slots = master_job_slots;
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    24
+
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    25
           /* Reset makeflags in case they were changed.  */
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    26
           {
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    27
             const char *pv = define_makeflags (1, 1);
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    28
@@ -2824,9 +2829,6 @@
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    29
 		       && (*(unsigned int *) cs->value_ptr ==
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    30
 			   *(unsigned int *) cs->noarg_value))
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    31
 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    32
-	      else if (cs->c == 'j')
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    33
-		/* Special case for `-j'.  */
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    34
-		ADD_FLAG ("1", 1);
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    35
 	      else
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    36
 		{
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    37
 		  char *buf = alloca (30);