components/make/patches/36106.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 submitted upstream as:
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     2
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     3
bug #36106: make target-specific variables fail if over 150 characters and contain semicolon
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     4
http://savannah.gnu.org/bugs/index.php?36106
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     5
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     6
--- a/read.c	2010-07-13 03:20:42.000000000 +0200
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     7
+++ b/read.c	2012-04-05 23:25:12.155011371 +0200
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     8
@@ -1071,12 +1071,12 @@
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     9
                after it.  */
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    10
             if (semip)
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    11
               {
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    12
-                unsigned int l = p - variable_buffer;
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    13
+                unsigned int l = p2 - variable_buffer;
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    14
                 *(--semip) = ';';
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    15
                 collapse_continuations (semip);
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    16
                 variable_buffer_output (p2 + strlen (p2),
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    17
                                         semip, strlen (semip)+1);
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    18
-                p = variable_buffer + l;
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    19
+                p2 = variable_buffer + l;
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    20
               }
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    21
             record_target_var (filenames, p2,
f112e7923000 7159246 gmake target-specific variables fail if over 150 characters and contain semicolon
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    22
                                vmod.override_v ? o_override : o_file,