wineinstall - Add support for parallel builds using 'nproc' to detect cpu count

[Chris Morgan]

On Fri, Feb 24, 2017 at 3:11 AM, Austin English <austinenglish at gmail.com>
wrote:

> On Fri, Feb 24, 2017 at 2:05 AM,  <wylda at volny.cz> wrote:
> > Hi,
> > i like/use "make -j 1" for log comparison. Can you leave NPROC=1 or
> allow override?
> >
> > W.
> >
> >
>
> Hi Wylda,
>
> Are you doing that with wineinstall? This doesn't affect normal
> ./configure && make, only ./tools/wineinstall.
>
> That said, allowing the user to set it via NPROC or similar would be a
> good idea IMO.
>
> --
> -Austin
> GPG: 14FB D7EA A041 937B
>



Is this what you had in mind? I wasn't sure how to document that you could
do:

NPROC=50 ./tools/wineinstall

to force 50 parallel processes.


commit 83321d6452706b5f8f93687ed4e0909aac47fd68
Author: Chris Morgan <chmorgan at gmail.com>
Date:   Tue Feb 21 17:03:30 2017 -0500

    wineinstall - Add support for parallel builds using 'nproc' to detect
cpu count

    Parallel builds can greatly reduce the overall build time on modern
multi-core processors.

    Fall back to two parallel builds in the case where nproc is
unavailable, most modern
    processors have at least two cores.

    Use the 'NPROC' value defined by the environment if it is not null.

diff --git a/tools/wineinstall b/tools/wineinstall
index e8e22bf..a757343 100755
--- a/tools/wineinstall
+++ b/tools/wineinstall
@@ -143,10 +143,22 @@ echo "in the meantime..."
 echo
 std_sleep

+# determine ideal number of parallel processes if NPROC isn't set
+# in the environment
+if [ ! -n $NPROC ]
+then
+    if [ -x `which nproc 2>/dev/null` ]
+    then
+        NPROC=$(nproc --all)
+    else
+        NPROC=2
+    fi
+fi
+
 # try to just make wine, if this fails 'make depend' and try to remake
-if ! { make; }
+if ! { make -j$NPROC; }
 then
-    if ! { make depend && make; }
+    if ! { make depend && make -j$NPROC; }
     then
       echo
       echo "Compilation failed, aborting install."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20170224/338461d8/attachment.html>