[Gsrc-commit] trunk r6512: main Make changes MAKE_ARGS fix

[Carl Hansen]

------------------------------------------------------------
revno: 6512
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Thu 2019-05-09 11:09:06 -0700
message:
  main Make changes MAKE_ARGS fix
added:
  gar/gar.site.mk                gar.site.mk-20190509180640-k78tuhg9akfhp9pc-1
modified:
  gar/gar.conf.mk                gar.conf.mk-20160617013739-fyi5aiwubjgbbvfn-2
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  gar/gar.mk                     gar.mk-20160617013745-r4h3dj0kiuppihsx-1

=== modified file 'gar/gar.conf.mk'
--- a/gar/gar.conf.mk   2019-03-04 05:13:20 +0000
+++ b/gar/gar.conf.mk   2019-05-09 18:09:06 +0000
@@ -4,10 +4,15 @@
 GARBALLDIR ?= $(GARDIR)/cache/garstow/garballs
 
 # Flags to pass to make to build in parallel.
+# adjust to your machine
 #MAKE_ARGS_PARALLEL ?= -j1
 MAKE_ARGS_PARALLEL ?= -j5
 #MAKE_ARGS_PARALLEL ?= -j8
 
+MAKE_ARGS += MAKE_ARGS_PARALLEL
+
+
+
 # List of packages that should not be installed automatically as
 # dependencies by GARStow -- for example, if they're provided by an
 # underlying operating system.

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2016-10-13 08:24:45 +0000
+++ b/gar/gar.lib.mk    2019-05-09 18:09:06 +0000
@@ -783,6 +783,8 @@
        cd $* && $(INSTALL_ENV) env DESTDIR=$(packageDESTDIR) ./waf install 
$(WAF_INSTALL_ARGS) $(OUTPUT)
        $(MAKECOOKIE)
 
+# ant, todo
+
 ######################################
 # Use a manifest file of the format:
 # src:dest[:mode[:owner[:group]]]

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2019-01-13 07:01:13 +0000
+++ b/gar/gar.mk        2019-05-09 18:09:06 +0000
@@ -354,6 +354,7 @@
 # Update a package: clean out the old stuff, download a new version,
 # rebuild the checksums and install it.
 update:
+       echo clean makesums install
        $(MAKE) clean
        $(MAKE) makesums
        $(MAKE) install

=== added file 'gar/gar.site.mk'
--- a/gar/gar.site.mk   1970-01-01 00:00:00 +0000
+++ b/gar/gar.site.mk   2019-05-09 18:09:06 +0000
@@ -0,0 +1,3 @@
+# Use this to override all previous makefile configs
+# for local use
+# This is a Makefile fragment that is included by the others.