From af0be3f093cebf8270bc8a23b7b65fbf7dc47d3a Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 3 Jul 2019 13:59:55 +0200 Subject: [PATCH] Update Nim submodules --- .gitmodules | 2 +- Tuprules.tup | 3 +-- nim/README.md | 4 ++-- nim/Tuprules.tup | 24 ++++++++++++++++++++++-- nim/binaries.tup | 14 -------------- nim/blobsets | 2 +- nim/carn_layouter | 2 +- nim/fetch_and_copy | 2 +- nim/icy_client | 2 +- nim/imap_report | 2 +- nim/musicbrainz_playlist_generator | 2 +- nim/nim-genode | 2 +- nim/nim-monero | 2 +- nim/ninep | 2 +- nim/xspf_view | 2 +- stub/.keep | 0 16 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 stub/.keep diff --git a/.gitmodules b/.gitmodules index e852c62ab..9a4799c29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -75,7 +75,7 @@ url = git@github.com:ehmry/blueMSX-libretro.git [submodule "nimble/fetch_and_copy"] path = nim/fetch_and_copy - url = git@github.com:ehmry/fetch_and_copy.git + url = git://depot.h4ck.me/srv/git/fetch_and_copy. [submodule "nimble/nim"] path = nim/nim url = https://github.com/ehmry/nim.git diff --git a/Tuprules.tup b/Tuprules.tup index 5c86076b5..931714ba5 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -25,8 +25,6 @@ STUB_DIR = $(TUP_CWD)/stub export NIX_PATH NIX_BUILD = nix-build --option substitute false -&STUB_DIR = upstream/stub - LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name` !prg = | $(GENODE_DIR)/ $(GENODE_DIR)/ \ @@ -155,6 +153,7 @@ AS_OPT += $(AS_MARCH) LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name` PKG_CONFIG_DIR = $(TUP_CWD)/pkg-config +&PKG_CONFIG_DIR = pkg-config PKG_CONFIG_PATH = $(PKG_CONFIG_DIR) PKG_CONFIG = PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config diff --git a/nim/README.md b/nim/README.md index 7311716a4..847f3eaaa 100644 --- a/nim/README.md +++ b/nim/README.md @@ -4,6 +4,6 @@ the repository contains an `*,nimble`, an `archives`, and a `runtime` file. ```tup include_rules -include $(NIMBLE_BINARIES_INCLUDE) -include $(NIMBLE_PACKAGE_INCLUDE) +include &(NIMBLE_BINARIES_INCLUDE) +include &(NIMBLE_PACKAGE_INCLUDE) ``` diff --git a/nim/Tuprules.tup b/nim/Tuprules.tup index 6a92c1489..5e80387c0 100644 --- a/nim/Tuprules.tup +++ b/nim/Tuprules.tup @@ -1,5 +1,15 @@ # Nim default variables +ifeq (@(TUP_ARCH),arm64) + NIM_CPU = arm64 +endif +ifeq (@(TUP_ARCH),i386) + NIM_CPU = i386 +endif +ifeq (@(TUP_ARCH),x86_64) + NIM_CPU = amd64 +endif + NIM_RELEASE_FLAG = -d:release # Drop the relase flag with the line "NIM_RELEASE_FLAG=" @@ -9,5 +19,15 @@ NIM_SRC_DIR = src BIN_VERSION = $(GIT_VERSION) # Use the git version as the binary package version -NIMBLE_BINARIES_INCLUDE = $(TUP_CWD)/binaries.tup -NIMBLE_PACKAGE_INCLUDE = $(TUP_CWD)/package.tup +&NIMBLE_BINARIES_INCLUDE = binaries.tup +&NIMBLE_PACKAGE_INCLUDE = package.tup + +!nim_build = | $(GENODE_DIR)/ $(GENODE_DIR)/ \ +|> ^o Nimble %B^ \ + PKG_CONFIG_PATH=`pwd`/$(PKG_CONFIG_DIR) \ + nimble cpp $(NIM_RELEASE_FLAG) $(NIM_FLAGS) \ + --cpu:$(NIM_CPU) --os:genode -d:posix \ + --parallelBuild:1 --passL:-L`pwd`/$(STUB_DIR) -o:%B %f \ +|> %B ./ + # Nim may invoke the C++ compiler at an arbitrary location, + # thus the relative $(PKG_CONFIG_DIR) is prepended with `pwd` diff --git a/nim/binaries.tup b/nim/binaries.tup index bc0c04fab..b8e83b54e 100644 --- a/nim/binaries.tup +++ b/nim/binaries.tup @@ -1,17 +1,3 @@ -ifeq (@(TUP_ARCH),arm64) - CPU = arm64 -endif -ifeq (@(TUP_ARCH),i386) - CPU = i386 -endif -ifeq (@(TUP_ARCH),x86_64) - CPU = amd64 -endif - -!nim_build = |> ^o Nimble %B^ \ - PKG_CONFIG_PATH=@(PKG_CONFIG_PATH) PATH=$PATH:@(TOOLCHAIN_PATH) nimble cpp $(NIM_RELEASE_FLAG) $(NIM_FLAGS) --cpu:$(CPU) --os:genode -d:posix --parallelBuild:1 -o:%B %f \ -|> %B ./ - : foreach $(NIM_SRC_DIR)/*.nim |> !nim_build |> {binary} : foreach {binary} |> !collect_bin |> : |> !bin |> diff --git a/nim/blobsets b/nim/blobsets index 2cc154f6b..aaa61aebd 160000 --- a/nim/blobsets +++ b/nim/blobsets @@ -1 +1 @@ -Subproject commit 2cc154f6b6d718ed4473fb4544547a7e4a5d5dee +Subproject commit aaa61aebd895e60de28936711b6231d9e555888a diff --git a/nim/carn_layouter b/nim/carn_layouter index 75cf89f0a..48b29f8d6 160000 --- a/nim/carn_layouter +++ b/nim/carn_layouter @@ -1 +1 @@ -Subproject commit 75cf89f0abe715074b959b737e14bdb20c4ea412 +Subproject commit 48b29f8d699571eb79ac73e248754e464f6b9bc7 diff --git a/nim/fetch_and_copy b/nim/fetch_and_copy index b435efd9b..80a63d06a 160000 --- a/nim/fetch_and_copy +++ b/nim/fetch_and_copy @@ -1 +1 @@ -Subproject commit b435efd9befcb1cf12bc7aa5ad5a71e759c6b8f1 +Subproject commit 80a63d06a41230f98a44b09c8167d14275efee7c diff --git a/nim/icy_client b/nim/icy_client index 9d59f400f..c16dd1b09 160000 --- a/nim/icy_client +++ b/nim/icy_client @@ -1 +1 @@ -Subproject commit 9d59f400f2a2c98be84c0598847dec9244b78cf3 +Subproject commit c16dd1b093dface9bb8be00da5edbc4b790363cc diff --git a/nim/imap_report b/nim/imap_report index bb4751297..e8abc833f 160000 --- a/nim/imap_report +++ b/nim/imap_report @@ -1 +1 @@ -Subproject commit bb47512970e1f7bdc453d5687a1239d203efb788 +Subproject commit e8abc833f3522794ea691e36f561fe8bf2481af4 diff --git a/nim/musicbrainz_playlist_generator b/nim/musicbrainz_playlist_generator index 3961d2ee7..84c694a34 160000 --- a/nim/musicbrainz_playlist_generator +++ b/nim/musicbrainz_playlist_generator @@ -1 +1 @@ -Subproject commit 3961d2ee7000236f9a35ac878d81643e0eb29d48 +Subproject commit 84c694a34b489157ce222de1b77d67f0775f9993 diff --git a/nim/nim-genode b/nim/nim-genode index e100bf80f..1d58fcff4 160000 --- a/nim/nim-genode +++ b/nim/nim-genode @@ -1 +1 @@ -Subproject commit e100bf80fbef15aa0b741bb1f58a976054142a02 +Subproject commit 1d58fcff44e4ad94a5fd5983e64989ba312f7d70 diff --git a/nim/nim-monero b/nim/nim-monero index 5109915ac..a50208a35 160000 --- a/nim/nim-monero +++ b/nim/nim-monero @@ -1 +1 @@ -Subproject commit 5109915ac162cd356a4fc06e367e790eb8024d62 +Subproject commit a50208a35aec3031c81f5b4d6141498465ebcf90 diff --git a/nim/ninep b/nim/ninep index 7889d655a..739918bcd 160000 --- a/nim/ninep +++ b/nim/ninep @@ -1 +1 @@ -Subproject commit 7889d655acdff0fcab8c939e93f7700ff6ea0d36 +Subproject commit 739918bcd740f1c3447d3fe54ff275919762c5fe diff --git a/nim/xspf_view b/nim/xspf_view index 40ae6930e..066b2c3fb 160000 --- a/nim/xspf_view +++ b/nim/xspf_view @@ -1 +1 @@ -Subproject commit 40ae6930ebc57cae6b1161344d10c899c6bfa6bd +Subproject commit 066b2c3fb9c005e1f29ee9a7c1b0431882790116 diff --git a/stub/.keep b/stub/.keep new file mode 100644 index 000000000..e69de29bb