commit f03c66bff4a76dc466fa5395b57ab98a86de0dcf
parent c693d7f3649df8abd2db647aaa9d49d27ac12f5b
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 10 Dec 2025 17:01:42 +0000
libtermkey
Diffstat:
9 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/templates/pkg/libtermkey b/templates/pkg/libtermkey
@@ -2,7 +2,7 @@
{%- set pkg_source="tar.gz" -%}
{%- import "package_sets" as ps -%}
{% extends "genlinks_mini" %}
-{%- do import_functions.update(["build_env_static", "check_static"]) %}
+{%- do import_functions.add("build_env_static") %}
{%- block template_deps -%}
{{ super() -}}
#+{{pkg_install_name("patch")}}
@@ -12,11 +12,22 @@
{%- block configure %}
patch -p1 <../litbermkey-build-static-lib.patch
+with_make_args() {
+ "$@" \
+ PREFIX="$prefix"
+ LIBDIR="$prefix/{{libdir}}"
+ INCDIR="$prefix/{{includedir}}"
+ MANDIR="$prefix/{{mandir}}"
+}
{% endblock configure %}
{%- block build %}
-make PREFIX="$PREFIX"
+with_make_args {{make}}
{%- endblock build %}
+{%- block install %}
+with_make_args make DESTDIR="$pthbs_destdir" install
+
+{%- endblock install %}
{% block genlinks_begin %}
x["./{{includedir}}/libtermkey.h"]=1
x["./{{libdir}}/libtermkey.a"]=1
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -83,7 +83,7 @@
#+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
#+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
#+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+vis.1e35a1095b881fd6177a31978ecd064995e04e12c0e8c983cb5b85a4465e5090
+#+vis.8537675eecfcbe2c0bb2fa52b204a62d93d5b5aade58710f467f2dad8f5f3e70
#+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
#+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
#+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
diff --git a/variants/ccx-x86_64/libtermkey b/variants/ccx-x86_64/libtermkey
@@ -41,21 +41,6 @@ build_env_static() {
export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
}
-check_static() {
- local exe || true
- exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1
- if ! test -f $exe; then
- printf '%s\n' "Error: file '$1' doesn't exist!"
- exit 1
- fi
- local interp_info || true
- interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
- if test x '!=' "x$interp_info"; then
- printf '%s\n' "Error: '$1' is a dynamic binary!"
- exit 1
- fi
-}
-
prefix=/home/ccx/versions/$pthbs_package
dest=${pthbs_destdir%/}${prefix}
cd 'libtermkey-0.22'
@@ -63,11 +48,17 @@ cd 'libtermkey-0.22'
patch -p1 <../litbermkey-build-static-lib.patch
+with_make_args() {
+ "$@" \
+ PREFIX="$prefix"
+ LIBDIR="$prefix/library"
+ INCDIR="$prefix/include"
+ MANDIR="$prefix/man"
+}
-make PREFIX="$PREFIX"make DESTDIR="$pthbs_destdir" install
-
-
+with_make_args make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+with_make_args make DESTDIR="$pthbs_destdir" install
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -83,7 +83,7 @@
#+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
#+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
#+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+vis.1e35a1095b881fd6177a31978ecd064995e04e12c0e8c983cb5b85a4465e5090
+#+vis.8537675eecfcbe2c0bb2fa52b204a62d93d5b5aade58710f467f2dad8f5f3e70
#+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
#+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
#+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
\ No newline at end of file
diff --git a/variants/ccx-x86_64/vis b/variants/ccx-x86_64/vis
@@ -31,7 +31,7 @@
#+gnu-make.4034f4d785c5108ad387088199242aa8aa6920e7aab1f79ce51d1f43e97cb580
#+netbsd-curses.62fbfa6e36ad4c26813723d03cbfe75c3e7d20f081b985904d933a07a84a541e
#+acl.666f9c995d30b0877cea7f754190eaa181bcfd6438b063382d8c7500d422e685
-#+libtermkey.4bd0a12e51b57df4ebdda81765f7360637ee315c8110dad1ae8659cdf7cba81f
+#+libtermkey.4608cfb85258c9337267a2acdf32b38a6415845fc6f93918ffd23a7654b0d734
#@git:6c519e91c684838bebcc6d49d894af956f6815b4:vis
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -83,7 +83,7 @@
#+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
#+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
#+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+vis.794289f9bc1cfac5a1beb4fd929cdd04166bfe9b7dc405578e6716783044ff56
+#+vis.c70dc95c245d8d1b095692b7bbf66a0ea589b0d23eaea423443ffa098a4aaf14
#+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
#+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
#+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
diff --git a/variants/root-x86_64/libtermkey b/variants/root-x86_64/libtermkey
@@ -41,21 +41,6 @@ build_env_static() {
export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
}
-check_static() {
- local exe || true
- exe=$pthbs_destdir'/versions'/$pthbs_package/$1
- if ! test -f $exe; then
- printf '%s\n' "Error: file '$1' doesn't exist!"
- exit 1
- fi
- local interp_info || true
- interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
- if test x '!=' "x$interp_info"; then
- printf '%s\n' "Error: '$1' is a dynamic binary!"
- exit 1
- fi
-}
-
prefix=/versions/$pthbs_package
dest=${pthbs_destdir%/}${prefix}
cd 'libtermkey-0.22'
@@ -63,11 +48,17 @@ cd 'libtermkey-0.22'
patch -p1 <../litbermkey-build-static-lib.patch
+with_make_args() {
+ "$@" \
+ PREFIX="$prefix"
+ LIBDIR="$prefix/library"
+ INCDIR="$prefix/include"
+ MANDIR="$prefix/man"
+}
-make PREFIX="$PREFIX"make DESTDIR="$pthbs_destdir" install
-
-
+with_make_args make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+with_make_args make DESTDIR="$pthbs_destdir" install
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -83,7 +83,7 @@
#+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
#+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
#+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+vis.794289f9bc1cfac5a1beb4fd929cdd04166bfe9b7dc405578e6716783044ff56
+#+vis.c70dc95c245d8d1b095692b7bbf66a0ea589b0d23eaea423443ffa098a4aaf14
#+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
#+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
#+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
\ No newline at end of file
diff --git a/variants/root-x86_64/vis b/variants/root-x86_64/vis
@@ -31,7 +31,7 @@
#+gnu-make.98dc2bc139672e6347bc2b2220304949f81b1851d2dc14778379568a0734db59
#+netbsd-curses.d3d7d0cf449972d5ce479a15d7298bad50ba445982cca9b12dc99d950330ce2c
#+acl.23ca5a4622293bd90f6f2ab470f433d31cc90adaf368baa42fe946da8d742373
-#+libtermkey.5dff634344816789370e7deb6f2c12dbd79379ddcae27ebddf31444887933f77
+#+libtermkey.a8a5a994ab56d7063ffdda0fbbe5b66ba6d186e23cc5c67268e50aa8f1578f8d
#@git:6c519e91c684838bebcc6d49d894af956f6815b4:vis
