[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdesvn-build-1.10
From:       Michael Pyne <mpyne () purinchu ! net>
Date:       2009-06-04 0:15:07
Message-ID: 1244074507.693523.17230.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 977380 by mpyne:

Do not add make-options to the make command line when performing the install

 M  +5 -30     kdesvn-build  


--- branches/work/kdesvn-build-1.10/kdesvn-build #977379:977380
@@ -2581,39 +2581,14 @@
         return 1;
     }
 
-    # Add make-options to the given options.
-    # If we're installing, we need to strip out parallel build options.  If any
-    # other options would break installation I will probably need to add a
-    # separate make-install-options option. :-(
-    unshift (@args, split(' ', $opts));
+    # Add make-options to the given options, unless we're installing (since
+    # things like parallel build options will break install).
+    if (not $installing) {
+        unshift (@args, split(' ', $opts));
+    }
 
     unshift (@args, $make);
 
-    if ($installing and grep(/^-j/, @args))
-    {
-        whisper "\tStripping parallel install instructions for g[$module]";
-
-        # Find -j option
-        for (my $i = 0; $i < scalar @args; ++$i)
-        {
-            if ($args[$i] =~ /^-j/)
-            {
-                # Found it, now decide whether to remove -jfoo option or -j
-                # and the next argument.
-                if ($args[$i] eq '-j')
-                {
-                    splice(@args, $i, 2); # Remove 2 elements at $i
-                }
-                else
-                {
-                    splice(@args, $i, 1); # Remove 1 element at $i
-                }
-
-                $i = -1; # Restart search ($i will increment to 0)
-            }
-        }
-    }
-
     my $description;
 
     # Check if we're installing
[prev in list] [next in list] [prev in thread] [next in thread]