commit e51091d6c5d3ac105d9e95f6540831afcca295b2
parent abe35026295960d439295efc61ddad00ee2ab944
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 18:21:17 +0000
argp-standalone
Diffstat:
15 files changed, 131 insertions(+), 56 deletions(-)
diff --git a/templates/pkg/argp-standalone b/templates/pkg/argp-standalone
@@ -1,20 +1,11 @@
-{% extends "genlinks" %}
-{%- block script %}
-#+{{pkg_install_name("musl-cross-make")}}
-#+{{pkg_install_name("gnu-make")}}
-#+{{pkg_install_name("busybox")}}
-#+{{pkg_install_name("busybox-diffutils")}}
-#@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
+{% extends "autotools" %}
+{%- block extra_deps %}
+#@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
+{%- endblock %}
+{% block at_script %}
+
+autotools_static argp-standalone-1.5.0
-{% include "functions/build_env_static" %}
-prefix={{versions}}/$pthbs_package
-build_env_static
-cd argp-standalone-1.5.0
-{{make}} PREFIX={{versions}}/$pthbs_package \
- DESTDIR="$pthbs_destdir" \
- INCDIR="$prefix/include" \
- LIBDIR="$prefix/library" \
- install-static
{% endblock %}
{% block genlinks_begin %}
x["./library/libargp.a"]=1
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -3,21 +3,63 @@
#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b
#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
-#@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
+#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
+#@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
export CPATH="$pthbs_build_environment/include"
export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
}
-prefix=/home/ccx/versions/$pthbs_package
-build_env_static
-cd argp-standalone-1.5.0
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/home/ccx/versions/$pthbs_package \
- DESTDIR="$pthbs_destdir" \
- INCDIR="$prefix/include" \
- LIBDIR="$prefix/library" \
- install-static
+autotools_config() {
+ prefix=/home/ccx/versions/$pthbs_package
+ ./configure -C \
+ --prefix="$prefix" \
+ --build="$(${CC:-gcc} -dumpmachine)" \
+ --bindir="$prefix/command" \
+ --sbindir="$prefix/command" \
+ --infodir="$prefix/info" \
+ --localedir="$prefix/locale" \
+ --mandir="$prefix/man" \
+ --libdir="$prefix/library" \
+ --docdir="$prefix/doc/argp-standalone" \
+ --datadir="$prefix/data" \
+ --datarootdir="$prefix/data" \
+ --localstatedir='/var/pthbs' \
+ "$@"
+
+}
+
+autotools() {
+ cd "$1"
+ shift
+ autotools_config "$@"
+ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+ make DESTDIR="$pthbs_destdir" install
+}
+
+autotools_static() {
+ build_env_static
+ autotools "$@" --enable-static --disable-shared
+}
+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
+ 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
+}
+
+
+autotools_static argp-standalone-1.5.0
+
+
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -15,4 +15,4 @@
#+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
-#+easyseccomp.238f707107363b2215072e5d84bdd2293c178e1e75f33566e422948b30ef2a96-
\ No newline at end of file
+#+easyseccomp.1773f4b5204399bc38421f8c0727687279c5e89d1b317818e06be21095467ad3+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -36,8 +36,8 @@
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
-#+system-config.63901c3528cff4f24bba7d62101506518cbc95d696ef5ff99292cef9b0884f0f
-#+system-config-rc.ddd704cbe8e7a3c87931937ee0dbb937fa56422d0e59dee66bc260ce32c66860
+#+system-config.dd7280a4a3179b2efe7bd7e2c19af6a275aa8e2031afdfce1f7460fab88d6efa
+#+system-config-rc.12e19311f53cf0c86cc2cc0bca5200b372f330fc1dd67178f76d11a2feef4a2c
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.57f0fec93d72ebec0e37b55963b9dd774fe4172c8f7fd0be201fc1de3bab9bed
+#+system-config-init.59762cdb250ec1c31f165bae46d7ee7a3ea67cfc079c8a8de4d5b2b7f20124f1
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -8,7 +8,7 @@
#+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
#+libseccomp.8b32056ea0458b22266d8fc1b3cce05c82d08282c40a1e56d00d15fa57cdc156
#+error-standalone.664c98067651c547ed8252fefb7237335ee7b15aa7ea4a338ff8d65dc02a6c0e
-#+argp-standalone.7a74302cba2f5fc1794fe047008b86207e088aff52b2fbb9a937bfc9bcdf5e23
+#+argp-standalone.5d1313cda46e986b052520e9d5290674a11d3cfd57f2a5379a31593ce1801f52
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/home/ccx/versions/env.81771911f76a4cdb0c3d53ba3a3878c1d8307abfc61e60d8929252d6a99adfb9' \
+ 'pthbs_path_containers=/home/ccx/versions/env.6d6dc64370da519b84a93e254615de981b188f65475484726b8aa5afce3ce903' \
'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132
#+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
-#+system-config-rc.ddd704cbe8e7a3c87931937ee0dbb937fa56422d0e59dee66bc260ce32c66860
+#+system-config-rc.12e19311f53cf0c86cc2cc0bca5200b372f330fc1dd67178f76d11a2feef4a2c
-s6rcdb=/home/ccx/versions/system-config-rc.ddd704cbe8e7a3c87931937ee0dbb937fa56422d0e59dee66bc260ce32c66860/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.12e19311f53cf0c86cc2cc0bca5200b372f330fc1dd67178f76d11a2feef4a2c/config/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+system-config.63901c3528cff4f24bba7d62101506518cbc95d696ef5ff99292cef9b0884f0f
+#+system-config.dd7280a4a3179b2efe7bd7e2c19af6a275aa8e2031afdfce1f7460fab88d6efa
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.63901c3528cff4f24bba7d62101506518cbc95d696ef5ff99292cef9b0884f0f/config/s6-rc-source
+src=/home/ccx/versions/system-config.dd7280a4a3179b2efe7bd7e2c19af6a275aa8e2031afdfce1f7460fab88d6efa/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone
@@ -3,21 +3,63 @@
#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465
#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
-#@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
+#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
+#@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
export CPATH="$pthbs_build_environment/include"
export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
}
-prefix=/versions/$pthbs_package
-build_env_static
-cd argp-standalone-1.5.0
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/versions/$pthbs_package \
- DESTDIR="$pthbs_destdir" \
- INCDIR="$prefix/include" \
- LIBDIR="$prefix/library" \
- install-static
+autotools_config() {
+ prefix=/versions/$pthbs_package
+ ./configure -C \
+ --prefix="$prefix" \
+ --build="$(${CC:-gcc} -dumpmachine)" \
+ --bindir="$prefix/command" \
+ --sbindir="$prefix/command" \
+ --infodir="$prefix/info" \
+ --localedir="$prefix/locale" \
+ --mandir="$prefix/man" \
+ --libdir="$prefix/library" \
+ --docdir="$prefix/doc/argp-standalone" \
+ --datadir="$prefix/data" \
+ --datarootdir="$prefix/data" \
+ --localstatedir='/var/pthbs' \
+ "$@"
+
+}
+
+autotools() {
+ cd "$1"
+ shift
+ autotools_config "$@"
+ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+ make DESTDIR="$pthbs_destdir" install
+}
+
+autotools_static() {
+ build_env_static
+ autotools "$@" --enable-static --disable-shared
+}
+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
+ 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
+}
+
+
+autotools_static argp-standalone-1.5.0
+
+
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -15,4 +15,4 @@
#+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
-#+easyseccomp.b6e902c3da858069c0f7ce4799d59f45c0cb72afd4c47cb2fa20048d4a31313f-
\ No newline at end of file
+#+easyseccomp.27f9af09622f1a4324cbc1d03611ee8cc3ce76b48212273718cc92d94e2f5d11+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -36,8 +36,8 @@
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
-#+system-config.d9e31fb6df53080426396f578aa2e30224ed357993287c29413f94ff7337549a
-#+system-config-rc.b9f71916478f4ab87de759390e7164c3c0141c59fb7385828f76c6ecfcb17445
+#+system-config.df7c6c3276173a63d669fc2d858a5b59adc114d52c0184a4dea214e3a254b877
+#+system-config-rc.e06807e55d970560cedc371e23bff442b332b78e30d0e2c4a5abae0d38c5ffb3
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.e020913ef90ccaf06f4edd92cc9310f5f60ed253b9c8b176fe399467d75232d5
+#+system-config-init.c24ecf9e3adb7b59f1bb3e759051865efd38e97f0ba3851fcc651721054a6fc2
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -8,7 +8,7 @@
#+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
#+libseccomp.cf3861629089b6a01e1499bd0296161802ff4978c7adde69cff19c5c5a568902
#+error-standalone.b756d86efb93b61ab49683dd2614413fc0a0c66fed3026f238ab32a725257ab2
-#+argp-standalone.384d51b79a2ce37003f82c079df9d6beea50e3435e2ddf74b0cb3a8e798b5d89
+#+argp-standalone.5c1f20d0d6f6f290182cacc89fb87a6f18cf7b639da406133a6aaf80ef08603d
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/versions/env.f3adda7c0ca3e23551d877ea31a372956bc0bc2b5c868cf70bca75eb2b448efe' \
+ 'pthbs_path_containers=/versions/env.5a1794303c81478188f79e5c39490afda7be898c977f2539f4a88e017c23e375' \
'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3
#+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
-#+system-config-rc.b9f71916478f4ab87de759390e7164c3c0141c59fb7385828f76c6ecfcb17445
+#+system-config-rc.e06807e55d970560cedc371e23bff442b332b78e30d0e2c4a5abae0d38c5ffb3
-s6rcdb=/versions/system-config-rc.b9f71916478f4ab87de759390e7164c3c0141c59fb7385828f76c6ecfcb17445/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.e06807e55d970560cedc371e23bff442b332b78e30d0e2c4a5abae0d38c5ffb3/config/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+system-config.d9e31fb6df53080426396f578aa2e30224ed357993287c29413f94ff7337549a
+#+system-config.df7c6c3276173a63d669fc2d858a5b59adc114d52c0184a4dea214e3a254b877
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.d9e31fb6df53080426396f578aa2e30224ed357993287c29413f94ff7337549a/config/s6-rc-source
+src=/versions/system-config.df7c6c3276173a63d669fc2d858a5b59adc114d52c0184a4dea214e3a254b877/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
