[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r6065: important meson ninja fixes, some other stuff
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r6065: important meson ninja fixes, some other stuff |
|
Date: |
Sat, 17 Nov 2018 03:23:33 -0500 (EST) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 6065
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Sat 2018-11-17 00:23:26 -0800
message:
important meson ninja fixes, some other stuff
removed:
pkg/gnu/readline/files/ files-20160617014725-uokjfnggs70iry9h-1641
pkg/gnu/readline/files/readline-6.3-link-ncurses.diff
readline6.3linkncurs-20160617014725-uokjfnggs70iry9h-2225
pkg/gnu/readline/files/readline-7.0-link-ncurses.diff
readline7.0linkncurs-20161117024515-ok2bs63w9a5dq34l-1
added:
gar/gar.lib/mesonninja.Nov2018.mk
mesonninja.nov2018.m-20181117072756-syppd0x8sbwu3cz4-1
modified:
gar/gar.lib/mesonninja.mk mesonninja.mk-20171030065946-2eocvxzl13nbloqy-1
pkg/gnome/gdk-pixbuf/Makefile makefile-20160617013746-7ygosxqw3lxxvo7f-483
pkg/gnome/gtk3/Makefile makefile-20160617013746-7ygosxqw3lxxvo7f-917
pkg/gnome/pango/Makefile makefile-20160617013746-7ygosxqw3lxxvo7f-1273
pkg/gnome/sushi/Makefile makefile-20160617013746-7ygosxqw3lxxvo7f-1361
pkg/gnome/sushi/sha256sums sha256sums-20160617013746-7ygosxqw3lxxvo7f-1365
pkg/gnu/gsegrafix/Makefile makefile-20160617014725-uokjfnggs70iry9h-948
pkg/gnu/readline/Makefile makefile-20160617014725-uokjfnggs70iry9h-1635
=== added file 'gar/gar.lib/mesonninja.Nov2018.mk'
--- a/gar/gar.lib/mesonninja.Nov2018.mk 1970-01-01 00:00:00 +0000
+++ b/gar/gar.lib/mesonninja.Nov2018.mk 2018-11-17 08:23:26 +0000
@@ -0,0 +1,78 @@
+# mesonninja.mk --- operations for meson and ninja
+
+# Copyright (C) 2017 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
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+# still being experimented with, nothing's perfect
+# why it NEEDS this, I do not know:
+LC_ALL=C.UTF-8
+LOCALLOCALE="C.UTF-8"
+
+WORKOBJ = $(WORKSRC).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) $(packageprefix) work: $(WORKOBJ)
+ @echo ----------------------------------------------
+ mkdir -p $(WORKOBJ)
+ @echo about to do: meson $(WORKSRC) $(WORKOBJ)
+ LC_ALL=$(LOCALLOCALE) meson setup --prefix=$(packageprefix)
$(WORKSRC) $(WORKOBJ)
+ $(MAKECOOKIE)
+
+#LC_ALL=C.UTF-8 meson setup $(WORKSRC) $(WORKOBJ)
+#LC_ALL=$(LOCALLOCALE) meson setup --prefix=$(prefix) $(WORKSRC) $(WORKOBJ)
+# .pc files no handled correctly
+# by meson , due to double destination dir...... arghg
+post-configure: configure-mes
+ @echo find----- a little hairy for make , maybe, but it works
---------------------------
+ for fi in `find -name \*.pc`; do \
+ echo $$fi ; \
+ sed -i 's*$(packageprefix)*$(prefix)*g' $$fi ; \
+ done
+ @echo end find----------------------------------------------
+ $(MAKECOOKIE)
+
+build-nin:
+ @echo ----------------------------------------------
+ @echo ----------------------------------------------
+ @echo --build-nin--------------------------------------------
+ @echo LC_ALL=C.UTF-8 ninja
+ cd $(WORKOBJ) && pwd
+ pwd
+ LC_ALL=$(LOCALLOCALE) ninja -v -C $(WORKOBJ)
+ @echo ----------------------------------------------
+ @echo ----------------------------------------------
+ $(MAKECOOKIE)
+
+#LC_ALL=C.UTF-8 ninja -v -C ${MESON_BUILD_ROOT}
+
+install-ninj:
+ @echo ----------------------------------------------
+ @echo ----------------------------------------------
+ @echo ----------------------------------------------
+ @echo ----------------------------------------------
+ @echo $(WORKOBJ) ninja -v install
+ @echo ----------install ninja -v ----------------------------
+ (cd $(WORKOBJ) && LC_ALL=$(LOCALLOCALE) ninja -v install )
+ $(MAKECOOKIE)
+
=== modified file 'gar/gar.lib/mesonninja.mk'
--- a/gar/gar.lib/mesonninja.mk 2018-09-12 22:45:42 +0000
+++ b/gar/gar.lib/mesonninja.mk 2018-11-17 08:23:26 +0000
@@ -24,7 +24,7 @@
WORKOBJ = $(WORKSRC).build
CONFIGURE_SCRIPTS = mes
BUILD_SCRIPTS = nin
-INSTALL_SCRIPTS = ninj
+#INSTALL_SCRIPTS = ninj
#MESON_BUILD_ROOT = $(PWD)/$(WORKOBJ)
include ../../../gar/gar.mk
@@ -32,25 +32,27 @@
configure-mes:
@echo conf.mes----------------------------------------------
- @echo $(prefix) $(packageprefix) work: $(WORKOBJ)
+ @echo prefix $(prefix) packageprefix $(packageprefix) workobj
$(WORKOBJ)
@echo ----------------------------------------------
mkdir -p $(WORKOBJ)
- @echo about to do: meson $(WORKSRC) $(WORKOBJ)
- LC_ALL=$(LOCALLOCALE) meson setup --prefix=$(packageprefix)
$(WORKSRC) $(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) meson setup --prefix=$(prefix) $(WORKSRC)
$(WORKOBJ)
+ LC_ALL=$(LOCALLOCALE) meson setup --prefix=$(prefix) $(WORKSRC)
$(WORKOBJ)
$(MAKECOOKIE)
#LC_ALL=C.UTF-8 meson setup $(WORKSRC) $(WORKOBJ)
#LC_ALL=$(LOCALLOCALE) meson setup --prefix=$(prefix) $(WORKSRC) $(WORKOBJ)
# .pc files no handled correctly
# by meson , due to double destination dir...... arghg
-post-configure: configure-mes
- @echo find----- a little hairy for make , maybe, but it works
---------------------------
- for fi in `find -name \*.pc`; do \
- echo $$fi ; \
- sed -i 's*$(packageprefix)*$(prefix)*g' $$fi ; \
- done
- @echo end find----------------------------------------------
- $(MAKECOOKIE)
+#post-configure: configure-mes
+# @echo find----- a little hairy for make , maybe, but it works
---------------------------
+# for fi in `find -name \*.pc`; do \
+# echo $$fi ; \
+# sed -i 's*$(packageprefix)*$(prefix)*g' $$fi ; \
+# done
+# @echo end find----------------------------------------------
+# $(MAKECOOKIE)
build-nin:
@echo ----------------------------------------------
@@ -66,13 +68,25 @@
#LC_ALL=C.UTF-8 ninja -v -C ${MESON_BUILD_ROOT}
-install-ninj:
- @echo ----------------------------------------------
- @echo ----------------------------------------------
- @echo ----------------------------------------------
- @echo ----------------------------------------------
+#install-ninj:
+
+pre-install:
+ @echo ----------------------------------------------
+ @echo ----------------------------------------------
+ @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 ----------------------------
- (cd $(WORKOBJ) && LC_ALL=$(LOCALLOCALE) ninja -v install )
+ 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)/
$(MAKECOOKIE)
+
+
=== modified file 'pkg/gnome/gdk-pixbuf/Makefile'
--- a/pkg/gnome/gdk-pixbuf/Makefile 2018-09-29 08:43:44 +0000
+++ b/pkg/gnome/gdk-pixbuf/Makefile 2018-11-17 08:23:26 +0000
@@ -83,4 +83,5 @@
# env
GDK_PIXBUF_MODULEDIR=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
gdk-pixbuf-query-loaders >
$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
# $(MAKECOOKIE)
+#pre-install: install-ninj
=== modified file 'pkg/gnome/gtk3/Makefile'
--- a/pkg/gnome/gtk3/Makefile 2018-09-19 18:25:01 +0000
+++ b/pkg/gnome/gtk3/Makefile 2018-11-17 08:23:26 +0000
@@ -47,6 +47,5 @@
######################################################################
include ../../../gar/gar.lib/auto.mk
-#include ../../../gar/gar.lib/mesonninja.mk
include config.mk
=== modified file 'pkg/gnome/pango/Makefile'
--- a/pkg/gnome/pango/Makefile 2018-08-20 20:07:17 +0000
+++ b/pkg/gnome/pango/Makefile 2018-11-17 08:23:26 +0000
@@ -21,7 +21,7 @@
NAME = pango
GARNAME = pango
GARVERSION = 1.42.4
-OME_URL = http://www.gnome.org/
+HOME_URL = http://www.gnome.org/
DESCRIPTION = Internationalized text layout and rendering library
define BLURB
@@ -46,9 +46,9 @@
######################################################################
-include ../../../gar/gar.lib/mesonninja.mk
+#include ../../../gar/gar.lib/mesonninja.mk
# ninja doesn't install .la files.....
#
-#include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/auto.mk
include config.mk
=== modified file 'pkg/gnome/sushi/Makefile'
--- a/pkg/gnome/sushi/Makefile 2018-09-29 08:43:44 +0000
+++ b/pkg/gnome/sushi/Makefile 2018-11-17 08:23:26 +0000
@@ -19,7 +19,7 @@
NAME = sushi
GARNAME = sushi
-GARVERSION = 3.30.0
+GARVERSION = 3.31.2
HOME_URL = http://www.gnome.org/
DESCRIPTION = A quick previewer for Nautilus
define BLURB
@@ -43,6 +43,6 @@
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/mesonninja.mk
include config.mk
=== modified file 'pkg/gnome/sushi/sha256sums'
--- a/pkg/gnome/sushi/sha256sums 2018-09-29 08:43:44 +0000
+++ b/pkg/gnome/sushi/sha256sums 2018-11-17 08:23:26 +0000
@@ -1,2 +1,2 @@
-d2da55498770c7b6bb7858aa1eef5c591fcbbf36aa24fc879f8e8c930b8fea7e
download/sushi-3.30.0.tar.xz
-acc8e1d05d2eebe695ad8fae21fb58a720777a80faf8bdb7b764b75356e9d6b9
download/sushi-3.30.0.sha256sum
+993bdaaed2384dda1a2eb2eaa9042f5223fddc07ab46b56d8a7176c3d50a5a30
download/sushi-3.31.2.tar.xz
+6300ba9ff9fa76778300bcb69d45d994c909a045d0b429aee771c7fd2d419c45
download/sushi-3.31.2.sha256sum
=== modified file 'pkg/gnu/gsegrafix/Makefile'
--- a/pkg/gnu/gsegrafix/Makefile 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/gsegrafix/Makefile 2018-11-17 08:23:26 +0000
@@ -38,8 +38,8 @@
SIGFILES = $(DISTNAME).tar.gz.sig
BUILDDEPS =
-LIBDEPS = intltool gtk libgnomecanvas libbonoboui gconf gnome-vfs \
- gnome-keyring libgnome libgnomeui
+LIBDEPS =# intltool gtk libgnomecanvas libbonoboui gconf gnome-vfs \
+ #gnome-keyring libgnome libgnomeui
######################################################################
=== modified file 'pkg/gnu/readline/Makefile'
--- a/pkg/gnu/readline/Makefile 2018-09-17 18:08:45 +0000
+++ b/pkg/gnu/readline/Makefile 2018-11-17 08:23:26 +0000
@@ -23,7 +23,7 @@
GARNAME = readline
GARVERSION = 8.0-beta
#GARVERSION = 7.0
-PATCHNUM = 3
+#PATCHNUM = 3
HOME_URL = http://www.gnu.org/software/readline/
DESCRIPTION = Edit command lines while typing, with history support
define BLURB
@@ -54,8 +54,8 @@
#$(foreach patchfile, $(upstream_patches), $(patchfile).sig)
INFO_FILES = $(GARNAME).info history.info rluserman.info
-BUILDDEPS =
-LIBDEPS = #ncurses
+BUILDDEPS = ncurses
+LIBDEPS =
######################################################################
=== removed directory 'pkg/gnu/readline/files'
=== removed file 'pkg/gnu/readline/files/readline-6.3-link-ncurses.diff'
--- a/pkg/gnu/readline/files/readline-6.3-link-ncurses.diff 2016-06-17
19:08:15 +0000
+++ b/pkg/gnu/readline/files/readline-6.3-link-ncurses.diff 1970-01-01
00:00:00 +0000
@@ -1,18 +0,0 @@
-This patch is to make sure that `libncurses' is among the `NEEDED'
-dependencies of `libreadline.so' and `libhistory.so'.
-
-Failing to do that, applications linking against Readline are
-forced to explicitly link against libncurses as well; in addition,
-this trick doesn't work when using GNU ld's `--as-needed'.
-
---- work/readline-6.2/shlib/Makefile.in 2009-01-06 18:03:22.000000000
+0100
-+++ work/readline-6.2/shlib/Makefile.in 2009-07-27 14:43:25.000000000
+0200
-@@ -84,7 +84,7 @@ SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@
- SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@
- SHOBJ_LIBS = @SHOBJ_LIBS@
-
--SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@
-+SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ -lncurses
- SHLIB_LIBS = @SHLIB_LIBS@
-
- SHLIB_DOT = @SHLIB_DOT@
=== removed file 'pkg/gnu/readline/files/readline-7.0-link-ncurses.diff'
--- a/pkg/gnu/readline/files/readline-7.0-link-ncurses.diff 2016-11-17
02:46:20 +0000
+++ b/pkg/gnu/readline/files/readline-7.0-link-ncurses.diff 1970-01-01
00:00:00 +0000
@@ -1,18 +0,0 @@
-This patch is to make sure that `libncurses' is among the `NEEDED'
-dependencies of `libreadline.so' and `libhistory.so'.
-
-Failing to do that, applications linking against Readline are
-forced to explicitly link against libncurses as well; in addition,
-this trick doesn't work when using GNU ld's `--as-needed'.
-
---- work/readline-6.2/shlib/Makefile.in 2009-01-06 18:03:22.000000000
+0100
-+++ work/readline-6.2/shlib/Makefile.in 2009-07-27 14:43:25.000000000
+0200
-@@ -84,7 +84,7 @@ SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@
- SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@
- SHOBJ_LIBS = @SHOBJ_LIBS@
-
--SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@
-+SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ -lncurses
- SHLIB_LIBS = @SHLIB_LIBS@
-
- SHLIB_DOT = @SHLIB_DOT@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r6065: important meson ninja fixes, some other stuff,
Carl Hansen <=