summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.subgitrc4
-rw-r--r--lib/liballoc/build.rmk.tmpl4
-rw-r--r--lib/libdvec/.subgitrc2
-rw-r--r--lib/libdvec/lib/liballoc/.gitignore2
-rw-r--r--lib/libdvec/lib/liballoc/build.rmk.tmpl (renamed from lib/libdvec/lib/liballoc/build.jst.tmpl)4
-rwxr-xr-xlib/libdvec/lib/liballoc/configure4
6 files changed, 11 insertions, 9 deletions
diff --git a/.subgitrc b/.subgitrc
index 3c940f4..85405c6 100644
--- a/.subgitrc
+++ b/.subgitrc
@@ -5,10 +5,10 @@ declare -A subgit subgitinfo
subgit[lib/libdvec]=1
subgitinfo[lib/libdvec/remote]='git@sinitax.com:sinitax/libdvec-c'
subgitinfo[lib/libdvec/branch]='master'
-subgitinfo[lib/libdvec/commit]='4310a29826e5263619355c3b8a6803f532e17e37'
+subgitinfo[lib/libdvec/commit]='ef008e83233fe17f5ab2369da843d9e47a9cf857'
subgit[lib/liballoc]=1
subgitinfo[lib/liballoc/remote]='git@sinitax.com:sinitax/liballoc-c'
subgitinfo[lib/liballoc/branch]='master'
-subgitinfo[lib/liballoc/commit]='24d37e4298575df36399f32a6fa5ef10b005c964'
+subgitinfo[lib/liballoc/commit]='58d22d92829a0b774604c80f46195d0aa8a8aa99'
diff --git a/lib/liballoc/build.rmk.tmpl b/lib/liballoc/build.rmk.tmpl
index 410749d..32a2bc8 100644
--- a/lib/liballoc/build.rmk.tmpl
+++ b/lib/liballoc/build.rmk.tmpl
@@ -43,7 +43,7 @@ command clean
rm -rf build
command cleanall
- just clean
+ rmk clean
command install
install -m755 build/liballoc.a -t "#{DESTDIR}#{PREFIX}#{LIBDIR}"
@@ -56,5 +56,5 @@ command uninstall
rm -f "#{DESTDIR}#{PREFIX}#{INCLDIR}/allocator.h"
command all
- just build/liballoc.a build/liballoc.so build/test
+ rmk build/liballoc.a build/liballoc.so build/test
diff --git a/lib/libdvec/.subgitrc b/lib/libdvec/.subgitrc
index 5f1b14f..fc6eb5e 100644
--- a/lib/libdvec/.subgitrc
+++ b/lib/libdvec/.subgitrc
@@ -5,5 +5,5 @@ declare -A subgit subgitinfo
subgit[lib/liballoc]=1
subgitinfo[lib/liballoc/remote]='git@sinitax.com:sinitax/liballoc-c'
subgitinfo[lib/liballoc/branch]='master'
-subgitinfo[lib/liballoc/commit]='24d37e4298575df36399f32a6fa5ef10b005c964'
+subgitinfo[lib/liballoc/commit]='58d22d92829a0b774604c80f46195d0aa8a8aa99'
diff --git a/lib/libdvec/lib/liballoc/.gitignore b/lib/libdvec/lib/liballoc/.gitignore
index ac80ccf..b6a670a 100644
--- a/lib/libdvec/lib/liballoc/.gitignore
+++ b/lib/libdvec/lib/liballoc/.gitignore
@@ -1,6 +1,6 @@
compile_commands.json
build
-build.jst
+build.rmk
.cache
vgcore*
.gdb_history
diff --git a/lib/libdvec/lib/liballoc/build.jst.tmpl b/lib/libdvec/lib/liballoc/build.rmk.tmpl
index 410749d..32a2bc8 100644
--- a/lib/libdvec/lib/liballoc/build.jst.tmpl
+++ b/lib/libdvec/lib/liballoc/build.rmk.tmpl
@@ -43,7 +43,7 @@ command clean
rm -rf build
command cleanall
- just clean
+ rmk clean
command install
install -m755 build/liballoc.a -t "#{DESTDIR}#{PREFIX}#{LIBDIR}"
@@ -56,5 +56,5 @@ command uninstall
rm -f "#{DESTDIR}#{PREFIX}#{INCLDIR}/allocator.h"
command all
- just build/liballoc.a build/liballoc.so build/test
+ rmk build/liballoc.a build/liballoc.so build/test
diff --git a/lib/libdvec/lib/liballoc/configure b/lib/libdvec/lib/liballoc/configure
index 9b3f0eb..16d5220 100755
--- a/lib/libdvec/lib/liballoc/configure
+++ b/lib/libdvec/lib/liballoc/configure
@@ -1,3 +1,5 @@
#!/bin/sh
-tmpl "$@" build.jst.tmpl > build.jst
+set -ex
+
+tmpl "$@" build.rmk.tmpl > build.rmk