summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Burda <contact@sinitax.com>2025-06-19 04:20:39 +0200
committerLouis Burda <contact@sinitax.com>2025-06-19 04:20:39 +0200
commit78a1da06f38e08a6c883f2eb449a66fe038c1294 (patch)
tree6ca190076718ddaa7787fa89ac2c6c8af473f4ef
parent13489155c4f392dee8a0e9247df4b3fee91dc6bc (diff)
downloadlibhmd-c-master.tar.gz
libhmd-c-master.zip
Update liballoc to rm%HEADmaster
-rw-r--r--.subgitrc2
-rw-r--r--lib/liballoc/.gitignore2
-rw-r--r--lib/liballoc/build.rmk.tmpl (renamed from lib/liballoc/build.jst.tmpl)4
-rwxr-xr-xlib/liballoc/configure4
4 files changed, 7 insertions, 5 deletions
diff --git a/.subgitrc b/.subgitrc
index 5f1b14f..fc6eb5e 100644
--- a/.subgitrc
+++ b/.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/liballoc/.gitignore b/lib/liballoc/.gitignore
index ac80ccf..b6a670a 100644
--- a/lib/liballoc/.gitignore
+++ b/lib/liballoc/.gitignore
@@ -1,6 +1,6 @@
compile_commands.json
build
-build.jst
+build.rmk
.cache
vgcore*
.gdb_history
diff --git a/lib/liballoc/build.jst.tmpl b/lib/liballoc/build.rmk.tmpl
index 410749d..32a2bc8 100644
--- a/lib/liballoc/build.jst.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/liballoc/configure b/lib/liballoc/configure
index 9b3f0eb..16d5220 100755
--- a/lib/liballoc/configure
+++ b/lib/liballoc/configure
@@ -1,3 +1,5 @@
#!/bin/sh
-tmpl "$@" build.jst.tmpl > build.jst
+set -ex
+
+tmpl "$@" build.rmk.tmpl > build.rmk