From 4a5d60955bca3c1175b3d6fd97df2ca172118c6f Mon Sep 17 00:00:00 2001 From: kozyilmaz Date: Mon, 6 Aug 2018 11:29:07 +0300 Subject: [PATCH] Squashed 'tools/' changes from 46b8265..b220f44 b220f44 cmake: version path typo 1fa2f62 Merge commit '9fc4adef91f7ea18c4cb9a72422165c90e6d09ce' 9fc4ade Squashed 'libmakefile/' changes from c0efce5..23f6a23 b83b10b package version update: cmake 3.12 coreutils 8.30 gcc 8.2.0 32f7671 git-subtree-check update to Bitcoin e3245f2e7b6f98cda38a3806da854f7d513fec2f git-subtree-dir: tools git-subtree-split: b220f441a814ea7bb5906e4c66b71eaaf60fb491 --- cmake/Makefile | 4 +- contrib/devtools/git-subtree-check.sh | 1 + coreutils/Makefile | 2 +- gnugcc/Makefile | 2 +- libmakefile/Makefile.lib | 76 ++++++++++++++------------- 5 files changed, 44 insertions(+), 41 deletions(-) diff --git a/cmake/Makefile b/cmake/Makefile index eb7db3c..abb9455 100644 --- a/cmake/Makefile +++ b/cmake/Makefile @@ -3,10 +3,10 @@ target_name ?= cmake include ../Makefile.build -CMAKE_VERSION="3.11.3" +CMAKE_VERSION="3.12.0" cmake_clone: - if [ ! -f "cmake-$(CMAKE_VERSION).tar.gz" ]; then curl -OL https://cmake.org/files/v3.11/cmake-$(CMAKE_VERSION).tar.gz; fi; + if [ ! -f "cmake-$(CMAKE_VERSION).tar.gz" ]; then curl -OL https://cmake.org/files/v3.12/cmake-$(CMAKE_VERSION).tar.gz; fi; if [ ! -d "cmake-$(CMAKE_VERSION)" ]; then tar xzf cmake-$(CMAKE_VERSION).tar.gz; fi cmake_config: diff --git a/contrib/devtools/git-subtree-check.sh b/contrib/devtools/git-subtree-check.sh index 1849517..85e8b84 100755 --- a/contrib/devtools/git-subtree-check.sh +++ b/contrib/devtools/git-subtree-check.sh @@ -3,6 +3,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. +export LC_ALL=C DIR="$1" COMMIT="$2" if [ -z "$COMMIT" ]; then diff --git a/coreutils/Makefile b/coreutils/Makefile index 846d0a4..4db27c3 100644 --- a/coreutils/Makefile +++ b/coreutils/Makefile @@ -3,7 +3,7 @@ target_name ?= coreutils include ../Makefile.build -COREUTILS_VERSION="8.29" +COREUTILS_VERSION="8.30" coreutils_clone: if [ ! -f "coreutils-$(COREUTILS_VERSION).tar.xz" ]; then curl -OL https://ftp.gnu.org/gnu/coreutils/coreutils-$(COREUTILS_VERSION).tar.xz; fi; diff --git a/gnugcc/Makefile b/gnugcc/Makefile index 59b934c..09d9b22 100644 --- a/gnugcc/Makefile +++ b/gnugcc/Makefile @@ -3,7 +3,7 @@ target_name ?= gnugcc include ../Makefile.build -GCC_VERSION="8.1.0" +GCC_VERSION="8.2.0" gnugcc_clone: if [ ! -f "gcc-$(GCC_VERSION).tar.gz" ]; then curl -OL http://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION)/gcc-$(GCC_VERSION).tar.gz; fi; diff --git a/libmakefile/Makefile.lib b/libmakefile/Makefile.lib index cb8f151..5463297 100644 --- a/libmakefile/Makefile.lib +++ b/libmakefile/Makefile.lib @@ -42,6 +42,8 @@ # 20180123 - add ./ to includes-y and libriries-y by default # 20180204 - seemless qt .moc, .ui support # 20180228 - rename distdir to dist.dir +# 20180718 - fix @.cmd +# 20180723 - use file_cflags-y if exists # # Example @@ -418,7 +420,7 @@ disp_distclean = $($(verbose)_disp_distclean) # _CMD # _cmd_depend.c = $(CC) $(CFLAGS) $($1_cflags) \ - $($1_includes) -M $$< | $(SED) 's,\($$(basename $$(basename $$(notdir $$@)))\.o\) *:,$$(dir $$@)\1 $$@: ,' > $$@; \ + $($1_includes) $$($1_$$<_cflags-y) -M $$< | $(SED) 's,\($$(basename $$(basename $$(notdir $$@)))\.o\) *:,$$(dir $$@)\1 $$@: ,' > $$@; \ $(CP) $$@ $$@.p; \ $(SED) -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$$$//' -e '/^$$$$/ d' -e 's/$$$$/ :/' < $$@ >> $$@.p; \ $(MV) $$@.p $$@ @@ -511,47 +513,47 @@ _cmd_distclean = $(RM) # # CMD # -cmd_depend.c = echo "$(_cmd_depend.c)" > $$@.cmd ; $(_cmd_depend.c) -cmd_compile.c = echo "$(_cmd_compile.c)" > $$@.cmd ; $(_cmd_compile.c) -cmd_link.c = echo "$(_cmd_link.c)" > $$@.cmd ; $(_cmd_link.c) -cmd_link_so.c = echo "$(_cmd_link_so.c)" > $$@.cmd ; $(_cmd_link_so.c) +cmd_depend.c = echo "$(subst ",\",$(_cmd_depend.c))" > $$@.cmd ; $(_cmd_depend.c) +cmd_compile.c = echo "$(subst ",\",$(_cmd_compile.c))" > $$@.cmd ; $(_cmd_compile.c) +cmd_link.c = echo "$(subst ",\",$(_cmd_link.c))" > $$@.cmd ; $(_cmd_link.c) +cmd_link_so.c = echo "$(subst ",\",$(_cmd_link_so.c))" > $$@.cmd ; $(_cmd_link_so.c) -cmd_depend.c.host = echo "$(_cmd_depend.c.host)" > $$@.cmd ; $(_cmd_depend.c.host) -cmd_compile.c.host = echo "$(_cmd_compile.c.host)" > $$@.cmd ; $(_cmd_compile.c.host) -cmd_link.c.host = echo "$(_cmd_link.c.host)" > $$@.cmd ; $(_cmd_link.c.host) -cmd_link_so.c.host = echo "$(_cmd_link_so.c.host)" > $$@.cmd ; $(_cmd_link_so.c.host) +cmd_depend.c.host = echo "$(subst ",\",$(_cmd_depend.c.host))" > $$@.cmd ; $(_cmd_depend.c.host) +cmd_compile.c.host = echo "$(subst ",\",$(_cmd_compile.c.host))" > $$@.cmd ; $(_cmd_compile.c.host) +cmd_link.c.host = echo "$(subst ",\",$(_cmd_link.c.host))" > $$@.cmd ; $(_cmd_link.c.host) +cmd_link_so.c.host = echo "$(subst ",\",$(_cmd_link_so.c.host))" > $$@.cmd ; $(_cmd_link_so.c.host) -cmd_depend.cxx = echo "$(_cmd_depend.cxx)" > $$@.cmd ; $(_cmd_depend.cxx) -cmd_compile.cxx = echo "$(_cmd_compile.cxx)" > $$@.cmd ; $(_cmd_compile.cxx) -cmd_link.cxx = echo "$(_cmd_link.cxx)" > $$@.cmd ; $(_cmd_link.cxx) -cmd_link_so.cxx = echo "$(_cmd_link_so.cxx)" > $$@.cmd ; $(_cmd_link_so.cxx) +cmd_depend.cxx = echo "$(subst ",\",$(_cmd_depend.cxx))" > $$@.cmd ; $(_cmd_depend.cxx) +cmd_compile.cxx = echo "$(subst ",\",$(_cmd_compile.cxx))" > $$@.cmd ; $(_cmd_compile.cxx) +cmd_link.cxx = echo "$(subst ",\",$(_cmd_link.cxx))" > $$@.cmd ; $(_cmd_link.cxx) +cmd_link_so.cxx = echo "$(subst ",\",$(_cmd_link_so.cxx))" > $$@.cmd ; $(_cmd_link_so.cxx) -cmd_depend.cxx.host = echo "$(_cmd_depend.cxx.host)" > $$@.cmd ; $(_cmd_depend.cxx.host) -cmd_compile.cxx.host = echo "$(_cmd_compile.cxx.host)" > $$@.cmd; $(_cmd_compile.cxx.host) -cmd_link.cxx.host = echo "$(_cmd_link.cxx.host)" > $$@.cmd ; $(_cmd_link.cxx.host) -cmd_link_so.cxx.host = echo "$(_cmd_link_so.cxx.host)" > $$@.cmd; $(_cmd_link_so.cxx.host) +cmd_depend.cxx.host = echo "$(subst ",\",$(_cmd_depend.cxx.host))" > $$@.cmd ; $(_cmd_depend.cxx.host) +cmd_compile.cxx.host = echo "$(subst ",\",$(_cmd_compile.cxx.host))" > $$@.cmd; $(_cmd_compile.cxx.host) +cmd_link.cxx.host = echo "$(subst ",\",$(_cmd_link.cxx.host))" > $$@.cmd ; $(_cmd_link.cxx.host) +cmd_link_so.cxx.host = echo "$(subst ",\",$(_cmd_link_so.cxx.host))" > $$@.cmd; $(_cmd_link_so.cxx.host) -cmd_moc.qt = echo "$(_cmd_moc.qt)" > $$@.cmd ; $(_cmd_moc.qt) -cmd_moc.qt.host = echo "$(_cmd_moc.qt.host)" > $$@.cmd ; $(_cmd_moc.qt.host) +cmd_moc.qt = echo "$(subst ",\",$(_cmd_moc.qt))" > $$@.cmd ; $(_cmd_moc.qt) +cmd_moc.qt.host = echo "$(subst ",\",$(_cmd_moc.qt.host))" > $$@.cmd ; $(_cmd_moc.qt.host) -cmd_uic.qt = echo "$(_cmd_uic.qt)" > $$@.cmd ; $(_cmd_uic.qt) -cmd_uic.qt.host = echo "$(_cmd_uic.qt.host)" > $$@.cmd ; $(_cmd_uic.qt.host) +cmd_uic.qt = echo "$(subst ",\",$(_cmd_uic.qt))" > $$@.cmd ; $(_cmd_uic.qt) +cmd_uic.qt.host = echo "$(subst ",\",$(_cmd_uic.qt.host))" > $$@.cmd ; $(_cmd_uic.qt.host) -cmd_depend.m = echo "$(_cmd_depend.m)" > $$@.cmd ; $(_cmd_depend.m) -cmd_compile.m = echo "$(_cmd_compile.m)" > $$@.cmd ; $(_cmd_compile.m) -cmd_link.m = echo "$(_cmd_link.m)" > $$@.cmd ; $(_cmd_link.m) -cmd_link_so.m = echo "$(_cmd_link_so.m)" > $$@.cmd ; $(_cmd_link_so.m) +cmd_depend.m = echo "$(subst ",\",$(_cmd_depend.m))" > $$@.cmd ; $(_cmd_depend.m) +cmd_compile.m = echo "$(subst ",\",$(_cmd_compile.m))" > $$@.cmd ; $(_cmd_compile.m) +cmd_link.m = echo "$(subst ",\",$(_cmd_link.m))" > $$@.cmd ; $(_cmd_link.m) +cmd_link_so.m = echo "$(subst ",\",$(_cmd_link_so.m))" > $$@.cmd ; $(_cmd_link_so.m) -cmd_depend.m.host = echo "$(_cmd_depend.m.host)" > $$@.cmd ; $(_cmd_depend.m.host) -cmd_compile.m.host = echo "$(_cmd_compile.m.host)" > $$@.cmd ; $(_cmd_compile.m.host) -cmd_link.m.host = echo "$(_cmd_link.m.host)" > $$@.cmd ; $(_cmd_link.m.host) -cmd_link_so.m.host = echo "$(_cmd_link_so.m.host)" > $$@.cmd ; $(_cmd_link_so.m.host) +cmd_depend.m.host = echo "$(subst ",\",$(_cmd_depend.m.host))" > $$@.cmd ; $(_cmd_depend.m.host) +cmd_compile.m.host = echo "$(subst ",\",$(_cmd_compile.m.host))" > $$@.cmd ; $(_cmd_compile.m.host) +cmd_link.m.host = echo "$(subst ",\",$(_cmd_link.m.host))" > $$@.cmd ; $(_cmd_link.m.host) +cmd_link_so.m.host = echo "$(subst ",\",$(_cmd_link_so.m.host))" > $$@.cmd ; $(_cmd_link_so.m.host) -cmd_ar = echo "$(_cmd_ar)" > $$@.cmd ; $(_cmd_ar) -cmd_ranlib = echo "$(_cmd_ranlib)" >> $$@.cmd ; $(_cmd_ranlib) -cmd_ld = echo "$(_cmd_ld)" > $$@.cmd ; $(_cmd_ld) +cmd_ar = echo "$(subst ",\",$(_cmd_ar))" > $$@.cmd ; $(_cmd_ar) +cmd_ranlib = echo "$(subst ",\",$(_cmd_ranlib))" >> $$@.cmd ; $(_cmd_ranlib) +cmd_ld = echo "$(subst ",\",$(_cmd_ld))" > $$@.cmd ; $(_cmd_ld) -cmd_ld.host = echo "$(_cmd_ld.host)" > $$@.cmd ; $(_cmd_ld.host) +cmd_ld.host = echo "$(subst ",\",$(_cmd_ld.host))" > $$@.cmd ; $(_cmd_ld.host) cmd_cp = $(_cmd_cp) cmd_mkdir = $(_cmd_mkdir) @@ -583,11 +585,11 @@ do_compile.cxx.host = @$(disp_compile.cxx.host) ; $(MKDIR) $$(dir $$@); $(cmd_co do_link.cxx.host = @$(disp_link.cxx.host) ; $(MKDIR) $$(dir $$@); $(cmd_link.cxx.host) do_link_so.cxx.host = @$(disp_link_so.cxx.host) ; $(MKDIR) $$(dir $$@); $(cmd_link_so.cxx.host) -do_moc.qt = @$(disp_moc.qt) ; $(MKDIR) $$(dir $$@); $(cmd_moc.qt) -do_moc.qt.host = @$(disp_moc.qt.host ; $(MKDIR) $$(dir $$@); $(cmd_moc.qt.host) +do_moc.qt = @$(disp_moc.qt) ; $(MKDIR) $$(dir $$@); $(cmd_moc.qt) +do_moc.qt.host = @$(disp_moc.qt.host ; $(MKDIR) $$(dir $$@); $(cmd_moc.qt.host) -do_uic.qt = @$(disp_uic.qt) ; $(MKDIR) $$(dir $$@); $(cmd_uic.qt) -do_uic.qt.host = @$(disp_uic.qt.host ; $(MKDIR) $$(dir $$@); $(cmd_uic.qt.host) +do_uic.qt = @$(disp_uic.qt) ; $(MKDIR) $$(dir $$@); $(cmd_uic.qt) +do_uic.qt.host = @$(disp_uic.qt.host ; $(MKDIR) $$(dir $$@); $(cmd_uic.qt.host) do_depend.m = @$(disp_depend.m) ; $(MKDIR) $$(dir $$@); $(cmd_depend.m) do_compile.m = @$(disp_compile.m) ; $(MKDIR) $$(dir $$@); $(cmd_compile.m)