mrrl

commit 80e1d191e9965c2dbc10774c171145c1e3307f68
parent 22e223e75d7799ad8bcf5d3369c3393d1df59499
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Wed, 10 Dec 2025 17:59:51 +0000

libtermkey

Diffstat:
M
templates/pkg/libtermkey
 | 
12
++++++++----
M
variants/ccx-x86_64/default.environment
 | 
2
+-
M
variants/ccx-x86_64/libtermkey
 | 
13
++++++++-----
M
variants/ccx-x86_64/userspace.environment
 | 
2
+-
M
variants/ccx-x86_64/vis
 | 
2
+-
M
variants/root-x86_64/default.environment
 | 
2
+-
M
variants/root-x86_64/libtermkey
 | 
13
++++++++-----
M
variants/root-x86_64/userspace.environment
 | 
2
+-
M
variants/root-x86_64/vis
 | 
2
+-

9 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/templates/pkg/libtermkey b/templates/pkg/libtermkey
@@ -1,5 +1,6 @@
 {%- set pkg_version="0.22" -%}
 {%- set pkg_source="tar.gz" -%}
+{%- set src_dir="." -%}
 {%- import "package_sets" as ps -%}
 {% extends "genlinks_mini" %}
 {%- do import_functions.add("build_env_static") %}
@@ -11,13 +12,16 @@
 #+{{pkg_install_name("pkgconf-pkg-config")}}
 {% endblock template_deps %}
 {%- block build %}
-gcc -c "$CFLAGS" "$CPPFLAGS" -o termkey.o    termkey.c
-gcc -c "$CFLAGS" "$CPPFLAGS" -o driver-csi.o driver-csi.c
-gcc -c "$CFLAGS" "$CPPFLAGS" -o driver-i.o   driver-i.c
-ar r libtermkey.a  termkey.o driver-csi.o driver-i.o  
+CFLAGS="-O2 $CFLAGS"
+src="{{shortname}}-{{pkg_version}}"
+gcc -c "$CFLAGS" "$CPPFLAGS" -o $src/termkey.o    $src/termkey.c
+gcc -c "$CFLAGS" "$CPPFLAGS" -o $src/driver-csi.o $src/driver-csi.c
+gcc -c "$CFLAGS" "$CPPFLAGS" -o $src/driver-i.o   $src/driver-i.c
+ar r $src/libtermkey.a  $src/termkey.o $src/driver-csi.o $src/driver-i.o  
 
 {%- endblock build %}
 {%- block install %}
+cd $src
 install -d "$dest"/{{includedir|shesc}}
 install -m644 termkey.h "$dest"/{{includedir|shesc}}
 install -d "$dest"/{{libdir|shesc}}/pkgconfig
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.400a348a6218004ce40975363843d6e80338d86f6d54cbbbbaba67780d95c4f6
+#+vis.93987f72de17421daa9c343d489376ed7cbe7f0c220a37e2da9250fc816e9130
 #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
 #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
diff --git a/variants/ccx-x86_64/libtermkey b/variants/ccx-x86_64/libtermkey
@@ -44,14 +44,17 @@ build_env_static() {
 
 prefix=/home/ccx/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
-cd 'libtermkey-0.22'
+cd '.'
 
 
 
-gcc -c "$CFLAGS" "$CPPFLAGS" -o termkey.o    termkey.c
-gcc -c "$CFLAGS" "$CPPFLAGS" -o driver-csi.o driver-csi.c
-gcc -c "$CFLAGS" "$CPPFLAGS" -o driver-i.o   driver-i.c
-ar r libtermkey.a  termkey.o driver-csi.o driver-i.o
+CFLAGS="-O2 $CFLAGS"
+src="libtermkey-0.22"
+gcc -c "$CFLAGS" "$CPPFLAGS" -o $src/termkey.o    $src/termkey.c
+gcc -c "$CFLAGS" "$CPPFLAGS" -o $src/driver-csi.o $src/driver-csi.c
+gcc -c "$CFLAGS" "$CPPFLAGS" -o $src/driver-i.o   $src/driver-i.c
+ar r $src/libtermkey.a  $src/termkey.o $src/driver-csi.o $src/driver-i.o
+cd $src
 install -d "$dest"/'include'
 install -m644 termkey.h "$dest"/'include'
 install -d "$dest"/'library'/pkgconfig
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.400a348a6218004ce40975363843d6e80338d86f6d54cbbbbaba67780d95c4f6
+#+vis.93987f72de17421daa9c343d489376ed7cbe7f0c220a37e2da9250fc816e9130
 #+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.e7758b9856fc9a0fc11b8c556b62ffc33eecf15c21d74aec1e741aeab63932fc
+#+libtermkey.f581b9ad4d6f32e695f68bc145d4846e2a8bf8d90735c4e6cd7b2c9b66373da4
 #@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.d5ab8e0b7eaba6a29b2e1988be97eb6853bfdf32244184c98eb60efd69cd13ca
+#+vis.722ee12512c040ded42b90b154b34bb38d2ae9b8e6b003e7aa69cf12bc5ca877
 #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
 #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
diff --git a/variants/root-x86_64/libtermkey b/variants/root-x86_64/libtermkey
@@ -44,14 +44,17 @@ build_env_static() {
 
 prefix=/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
-cd 'libtermkey-0.22'
+cd '.'
 
 
 
-gcc -c "$CFLAGS" "$CPPFLAGS" -o termkey.o    termkey.c
-gcc -c "$CFLAGS" "$CPPFLAGS" -o driver-csi.o driver-csi.c
-gcc -c "$CFLAGS" "$CPPFLAGS" -o driver-i.o   driver-i.c
-ar r libtermkey.a  termkey.o driver-csi.o driver-i.o
+CFLAGS="-O2 $CFLAGS"
+src="libtermkey-0.22"
+gcc -c "$CFLAGS" "$CPPFLAGS" -o $src/termkey.o    $src/termkey.c
+gcc -c "$CFLAGS" "$CPPFLAGS" -o $src/driver-csi.o $src/driver-csi.c
+gcc -c "$CFLAGS" "$CPPFLAGS" -o $src/driver-i.o   $src/driver-i.c
+ar r $src/libtermkey.a  $src/termkey.o $src/driver-csi.o $src/driver-i.o
+cd $src
 install -d "$dest"/'include'
 install -m644 termkey.h "$dest"/'include'
 install -d "$dest"/'library'/pkgconfig
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.d5ab8e0b7eaba6a29b2e1988be97eb6853bfdf32244184c98eb60efd69cd13ca
+#+vis.722ee12512c040ded42b90b154b34bb38d2ae9b8e6b003e7aa69cf12bc5ca877
 #+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.abc69396b837b2397fe1d0dead429eb523d33c95d43446dd3d64d8efc954c7e9
+#+libtermkey.344b0325e6e15f0eef0ebad2dc1a064371e83e14dc1239b0379e2d3ee902374a
 #@git:6c519e91c684838bebcc6d49d894af956f6815b4:vis