commit d2a17dc29d709f2f0edfc7402e1c4bdd1d8e8aeb
parent c903895fcf6e047ac4fbd0d1785c25d83284e4b9
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 10 Dec 2025 17:43:53 +0000
libtermkey
Diffstat:
9 files changed, 102 insertions(+), 46 deletions(-)
diff --git a/templates/pkg/libtermkey b/templates/pkg/libtermkey
@@ -9,25 +9,43 @@
{{ ps.toolchain() }}
#+{{pkg_install_name("gnu-make")}}
#+{{pkg_install_name("pkgconf-pkg-config")}}
-#@sha256:{{files["libtermkey-build-static-lib.patch"]}}:litbermkey-build-static-lib.patch
{% endblock template_deps %}
-{%- 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 %}
-with_make_args {{make}}
+gcc "$CFLAGS" -c -o termkey.o termkey.c
+gcc "$CFLAGS" -c -o driver-csi.o driver-csi.c
+gcc "$CFLAGS" -c -o driver-i.o driver-i.c
+ar r libtermkey.a termkey.o driver-csi.o driver-i.o
{%- endblock build %}
{%- block install %}
-with_make_args make DESTDIR="$pthbs_destdir" install
+install -d "$dest"/{{includedir|shesc}}
+install -m644 termkey.h "$dest"/{{includedir|shesc}}
+install -d "$dest"/{{libdir|shesc}}/pkgconfig
+env LIBDIR="$prefix"/{{libdir|shesc}} \
+ INCDIR="$prefix"/{{includedir|shesc}} \
+ VERSION={{pkg_version|shesc}} \
+ sh termkey.pc.sh \
+ >"$dest"/{{libdir|shesc}}/pkgconfig/termkey.pc
+
+install -d "$dest"/{{libdir|shesc}}
+install -m644 ibtermkey.a "$dest"/{{libdir|shesc}}/
+
+man3dir="$dest"/{{mandir|shesc}}/man3
+man7dir="$dest"/{{mandir|shesc}}/man7
+install -d "$man3dir"
+install -d "$man7dir"
+
+for F in man/*.3; do \
+ gzip $F
+ mv "$F".gz "$man3dir/"
+done
+for F in man/*.7; do \
+ gzip $F
+ mv "$F".gz "$man7dir/"
+done
+while read FROM EQ TO; do \
+ echo ln -sf $TO.gz "$man3dir/$FROM.gz"; \
+done < man/also
{%- endblock install %}
{% block genlinks_begin %}
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.842458d37e29a3fbdc64bcd952fc0d924a99067996cdf540772c24c2aef17358
+#+vis.4d942739afdfe4a679c818fd61089191d7a627f79b3ccb3bf4f82295dd7b7503
#+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
#+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
#+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
diff --git a/variants/ccx-x86_64/libtermkey b/variants/ccx-x86_64/libtermkey
@@ -31,7 +31,6 @@
#+musl-cross-make.14e02e45cc77fb5c9787349ef554dda78766f71652b100aee3b00e24a3d02cd1
#+gnu-make.4034f4d785c5108ad387088199242aa8aa6920e7aab1f79ce51d1f43e97cb580
#+pkgconf-pkg-config.d2f1547322d9ba8762a3aa73f0851720b99a3f5e95eb1531b7f8764f5c61c44f
-#@sha256:38546132164436766b5707c6a2ea63be6663c2af9655015677a90a0380889800:litbermkey-build-static-lib.patch
#@untar:-z:sha256:6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600:.
@@ -48,19 +47,39 @@ dest=${pthbs_destdir%/}${prefix}
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"
-}
-
-
-with_make_args make -j${JOBS:-1} -l$((1+${JOBS:-1}))
-with_make_args make DESTDIR="$pthbs_destdir" install
+gcc "$CFLAGS" -c -o termkey.o termkey.c
+gcc "$CFLAGS" -c -o driver-csi.o driver-csi.c
+gcc "$CFLAGS" -c -o driver-i.o driver-i.c
+ar r libtermkey.a termkey.o driver-csi.o driver-i.o
+install -d "$dest"/'include'
+install -m644 termkey.h "$dest"/'include'
+install -d "$dest"/'library'/pkgconfig
+env LIBDIR="$prefix"/'library' \
+ INCDIR="$prefix"/'include' \
+ VERSION='0.22' \
+ sh termkey.pc.sh \
+ >"$dest"/'library'/pkgconfig/termkey.pc
+
+install -d "$dest"/'library'
+install -m644 ibtermkey.a "$dest"/'library'/
+
+man3dir="$dest"/'man'/man3
+man7dir="$dest"/'man'/man7
+install -d "$man3dir"
+install -d "$man7dir"
+
+for F in man/*.3; do \
+ gzip $F
+ mv "$F".gz "$man3dir/"
+done
+for F in man/*.7; do \
+ gzip $F
+ mv "$F".gz "$man7dir/"
+done
+while read FROM EQ TO; do \
+ echo ln -sf $TO.gz "$man3dir/$FROM.gz"; \
+done < man/also
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.842458d37e29a3fbdc64bcd952fc0d924a99067996cdf540772c24c2aef17358
+#+vis.4d942739afdfe4a679c818fd61089191d7a627f79b3ccb3bf4f82295dd7b7503
#+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.8524a1d05e1cef5a706b10a2e339f69ba5fcb4b6e4e5f7f91bf2c542a53f607c
+#+libtermkey.a61ce08f78664bf9e6b95ed15cdea1dec437f009db064b6f14ff5786061092c2
#@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.e2f9dd7cc7191a9566a5eff492c7cab5499dd26f73442ec24e60a97d0fd2b537
+#+vis.aff3e35a4ba4451733e40237e83bf1f9207362883a59218763845ad9a8e51142
#+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
#+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
#+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
diff --git a/variants/root-x86_64/libtermkey b/variants/root-x86_64/libtermkey
@@ -31,7 +31,6 @@
#+musl-cross-make.581e6f7496a630a91679f40945ae85b1c9a3f1f5afd725bb7608ad60c058d8f9
#+gnu-make.98dc2bc139672e6347bc2b2220304949f81b1851d2dc14778379568a0734db59
#+pkgconf-pkg-config.c3d31ede6d00be8bbefb3513e3836d725a51781409722f7ab58d0a856a2a9738
-#@sha256:38546132164436766b5707c6a2ea63be6663c2af9655015677a90a0380889800:litbermkey-build-static-lib.patch
#@untar:-z:sha256:6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600:.
@@ -48,19 +47,39 @@ dest=${pthbs_destdir%/}${prefix}
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"
-}
-
-
-with_make_args make -j${JOBS:-1} -l$((1+${JOBS:-1}))
-with_make_args make DESTDIR="$pthbs_destdir" install
+gcc "$CFLAGS" -c -o termkey.o termkey.c
+gcc "$CFLAGS" -c -o driver-csi.o driver-csi.c
+gcc "$CFLAGS" -c -o driver-i.o driver-i.c
+ar r libtermkey.a termkey.o driver-csi.o driver-i.o
+install -d "$dest"/'include'
+install -m644 termkey.h "$dest"/'include'
+install -d "$dest"/'library'/pkgconfig
+env LIBDIR="$prefix"/'library' \
+ INCDIR="$prefix"/'include' \
+ VERSION='0.22' \
+ sh termkey.pc.sh \
+ >"$dest"/'library'/pkgconfig/termkey.pc
+
+install -d "$dest"/'library'
+install -m644 ibtermkey.a "$dest"/'library'/
+
+man3dir="$dest"/'man'/man3
+man7dir="$dest"/'man'/man7
+install -d "$man3dir"
+install -d "$man7dir"
+
+for F in man/*.3; do \
+ gzip $F
+ mv "$F".gz "$man3dir/"
+done
+for F in man/*.7; do \
+ gzip $F
+ mv "$F".gz "$man7dir/"
+done
+while read FROM EQ TO; do \
+ echo ln -sf $TO.gz "$man3dir/$FROM.gz"; \
+done < man/also
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.e2f9dd7cc7191a9566a5eff492c7cab5499dd26f73442ec24e60a97d0fd2b537
+#+vis.aff3e35a4ba4451733e40237e83bf1f9207362883a59218763845ad9a8e51142
#+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.17a0b98e17335af7c68d2130d59926e33bb45275002163deebd22a923140e03e
+#+libtermkey.cca15321383a11de551f54b5e54a31addbfd1f020b77387b83c97061e799c3dc
#@git:6c519e91c684838bebcc6d49d894af956f6815b4:vis
