[Gsrc-commit] trunk r6403: meson modified

[Carl Hansen]

------------------------------------------------------------
revno: 6403
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Sun 2019-04-07 18:45:12 -0700
message:
  meson modified
modified:
  gar/gar.lib/auto.mk            auto.mk-20160617013740-b2gc1gamt0k7pzjx-2
  gar/gar.lib/mesonninja.mk      mesonninja.mk-20171030065946-2eocvxzl13nbloqy-1
  pkg/gnome/atk/Makefile         makefile-20160617013746-7ygosxqw3lxxvo7f-304

=== modified file 'gar/gar.lib/auto.mk'
--- a/gar/gar.lib/auto.mk       2016-06-17 19:08:15 +0000
+++ b/gar/gar.lib/auto.mk       2019-04-08 01:45:12 +0000
@@ -6,6 +6,8 @@
 # permitted.  This software is without warranty of any kind.  The
 # author(s) shall not be liable in the event that use of the
 # software causes damage.
+#
+# autotools
 
 USE_AUTORECONF ?=
 USE_PARALLEL ?= y

=== modified file 'gar/gar.lib/mesonninja.mk'
--- a/gar/gar.lib/mesonninja.mk 2019-03-16 04:09:46 +0000
+++ b/gar/gar.lib/mesonninja.mk 2019-04-08 01:45:12 +0000
@@ -1,6 +1,6 @@
 # mesonninja.mk ---  operations for meson and ninja
 
-# Copyright (C) 2017, 2018 Carl Hansen <address@hidden>
+# Copyright (C) 2017, 2018, 2019 Carl Hansen <address@hidden>
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -21,26 +21,25 @@
 #LC_ALL=C.UTF-8
 #LOCALLOCALE="C.UTF-8"
 
-WORKOBJ = $(WORKSRC).build
+WORKOBJ = $(WORKDIR)/$(DISTNAME).build
 CONFIGURE_SCRIPTS = mes
 BUILD_SCRIPTS = nin
 #INSTALL_SCRIPTS = ninj
 
 #MESON_BUILD_ROOT = $(PWD)/$(WORKOBJ)
+
 include ../../../gar/gar.mk
 
-
 configure-mes: 
-       @echo conf.mes----------------------------------------------
-       @echo prefix $(prefix) packageprefix $(packageprefix)  workobj 
$(WORKOBJ)
-       @echo ----------------------------------------------
+       @echo configure-mes----------------------------------------------
+       @echo
+       @echo LC_ALL==$(LC_ALL) prefix==$(prefix) 
packageprefix==$(packageprefix)
+       @echo WORKSRC==$(WORKSRC)  WORKOBJ==$(WORKOBJ)
        mkdir -p $(WORKOBJ)
-       address@hidden about to do:     meson setup 
--prefix=$(prefix)/packages/$(DISTNAME)  $(WORKSRC) $(WORKOBJ)
-       #LC_ALL=$(LOCALLOCALE)  meson setup 
--prefix=$(prefix)/packages/$(DISTNAME)  $(WORKSRC) $(WORKOBJ)
-       #echo LC_ALL=$(LOCALLOCALE)  
-       echo meson setup --prefix=$(prefix)  $(WORKSRC) $(WORKOBJ)
-       #LC_ALL=$(LOCALLOCALE)  
+       @echo
        meson setup --prefix=$(prefix)  $(WORKSRC) $(WORKOBJ)
+       @echo
+       @echo end configure-mes----------------------------------------------
        $(MAKECOOKIE)
 
 #LC_ALL=C.UTF-8  meson setup   $(WORKSRC) $(WORKOBJ)
@@ -58,16 +57,13 @@
 #      $(MAKECOOKIE)
 
 build-nin: 
-       @echo ----------------------------------------------
-       @echo ----------------------------------------------
-       @echo --build-nin--------------------------------------------
-       @echo LC_ALL=C.UTF-8   ninja 
-       cd  $(WORKOBJ) && pwd
-       pwd
-       #LC_ALL=$(LOCALLOCALE)   
+       @echo build-nin--------------------------------------------
+       @echo ----------------------------------------------
+       @echo LC_ALL==$(LC_ALL) WORKSRC==$(WORKSRC)  WORKOBJ==$(WORKOBJ)
        ninja -v   -C $(WORKOBJ) 
        @echo ----------------------------------------------
        @echo ----------------------------------------------
+       @echo end build-nin--------------------------------------------
        $(MAKECOOKIE)
 
 #LC_ALL=C.UTF-8   ninja  -v  -C  ${MESON_BUILD_ROOT}
@@ -75,22 +71,25 @@
 #install-ninj:  
 
 pre-install:
-       @echo ----------------------------------------------
-       @echo ----------------------------------------------
+       @echo preinstall with ninja ----------------------------------------
        @echo ----------------------------------------------
        @echo ----------------------------------------------
        mkdir -p $(prefix)/packages/$(DISTNAME)
        mkdir -p $(prefix)/packages/$(DISTNAME)-DEST
        mkdir -p  $(packageprefix)/
-       @echo  $(WORKOBJ)   ninja -v install  
-       @echo ----------install ninja -v ----------------------------
-       DESTDIR=$(prefix)/packages/$(DISTNAME)-DEST LC_ALL=$(LOCALLOCALE)  
ninja -C $(WORKOBJ) -v install 
-       #LC_ALL=$(LOCALLOCALE)  ninja -C $(WORKOBJ) -v install 
-       #DESTDIR=$(prefix)/packages/$(DISTNAME) LC_ALL=$(LOCALLOCALE)  ninja -C 
$(WORKOBJ) -v install 
-       #DESTDIR=$(packageprefix)  LC_ALL=$(LOCALLOCALE)  ninja -C $(WORKOBJ) 
-v install 
-       #echo cp -ra  $(prefix)/packages/$(DISTNAME)/*  
$(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/ 
-       #cp -ra       $(prefix)/packages/$(DISTNAME)/*  
$(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/ 
+       @echo ----------install with  ninja -v ----------------------------
+       DESTDIR=$(prefix)/packages/$(DISTNAME)-DEST LC_ALL=$(LOCALLOCALE)  
ninja -v -C $(WORKOBJ)  install 
+       @echo ----------------------------------------------
+       @echo end preinstall with ninja ----------------------------------------
        $(MAKECOOKIE)
 
 
 
+#LC_ALL=$(LOCALLOCALE)  ninja -C $(WORKOBJ) -v install 
+#DESTDIR=$(prefix)/packages/$(DISTNAME) LC_ALL=$(LOCALLOCALE)  ninja -C 
$(WORKOBJ) -v install 
+#DESTDIR=$(packageprefix)  LC_ALL=$(LOCALLOCALE)  ninja -C $(WORKOBJ) -v 
install 
+#echo cp -ra  $(prefix)/packages/$(DISTNAME)/*  
$(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/ 
+#cp -ra       $(prefix)/packages/$(DISTNAME)/*  
$(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/ 
+
+
+

=== modified file 'pkg/gnome/atk/Makefile'
--- a/pkg/gnome/atk/Makefile    2019-03-11 23:46:26 +0000
+++ b/pkg/gnome/atk/Makefile    2019-04-08 01:45:12 +0000
@@ -1,5 +1,5 @@
 # Copyright © 2013, 2015, 2016 Brandon Invergo <address@hidden>
-# Copyright © 2017,2018,2019 Carl Hansen <address@hidden>
+# Copyright © 2017, 2018, 2019 Carl Hansen <address@hidden>
 #
 # This file is part of GSRC, the GNU Source Release Collection.
 #