mrrl

commit 591215aa501c92eff4e74fd918462d965915fb52
parent 57666022ed0361b02a648c6dc48b2a507f6e77f3
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue, 11 Nov 2025 01:04:39 +0000

mandoc

Diffstat:
M
templates/pkg/mandoc
 | 
7
++++---
M
variants/ccx-x86_64/default.environment
 | 
2
+-
M
variants/ccx-x86_64/mandoc
 | 
11
+++--------
M
variants/ccx-x86_64/userspace.environment
 | 
2
+-
M
variants/root-x86_64/default.environment
 | 
2
+-
M
variants/root-x86_64/mandoc
 | 
11
+++--------
M
variants/root-x86_64/userspace.environment
 | 
2
+-

7 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/templates/pkg/mandoc b/templates/pkg/mandoc
@@ -1,19 +1,20 @@
 {%- set pkg_version="1.14.6" -%}
 {%- set pkg_source="tar.gz" -%}
 {% extends "genlinks" %}
-{%- do import_functions.update(["build_env_static", "check_static"]) %}
+{%- do import_functions.update(["check_static"]) %}
 {%- block package_deps -%}
 #+{{pkg_install_name("musl-cross-make")}}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("busybox-diffutils")}}
 {% endblock package_deps %}
 {% block configure -%}
-build_env_static
+export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 cat >configure.local<<-__EOF__
 PREFIX="$prefix"
 MANDIR="$prefix/man"
 LIBDIR="$prefix/library"
-CFLAGS="$CFLAGS"
+CPATH="$pthbs_build_environment/include"
+LDFLAGS="-static -L$pthbs_build_environment/library"
 UTF8_LOCALE="en_US.UTF-8"
 MANPATH_DEFAULT=/run/current/man
 MANPATH_BASE=/run/current/man
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -85,7 +85,7 @@
 #+findutils.d9e7f71704cf89d5bb127931d1c1a27f4fe40879b7733a8f8c71a86a0c31c632
 #+nawk.e4d02d09a25319411ab52938892bddcd7f7b715f21da1757ded6b98c56780811
 #+squashfs-tools.dc473cbcc9137cefd0d45d7da5520b8e91a2582a1cc7bd1695418c4d7f4e3fcc
-#+mandoc.84ee35bf3049dfe8304a57b18628b688ee11f64622980807adbbd53079212662
+#+mandoc.f02f74a60b304a889acbf8207a6fb4251f1d6be0084a3ef6f65c7ccb3a1bebb4
 #+tinyssh.4d3bf98f61e15fcd7a507894d94ebf81db347202142d0316c18ee3d8c83a45e2
 #+system-config.30ae03a96b216cf17a2c63a437c184fcd16bea4b82de6e00e88bd50737d3cb13
 #+system-config-rc.c3b55f453abdcfe9d4f7d7c5f7512755333e9c8fa2eafc5cbe45ec37e7d51630
diff --git a/variants/ccx-x86_64/mandoc b/variants/ccx-x86_64/mandoc
@@ -34,12 +34,6 @@
 
 # - build script start -
 
-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"
-}
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1
@@ -59,12 +53,13 @@ prefix=/home/ccx/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd 'mandoc-1.14.6'
 
-build_env_static
+export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 cat >configure.local<<-__EOF__
 PREFIX="$prefix"
 MANDIR="$prefix/man"
 LIBDIR="$prefix/library"
-CFLAGS="$CFLAGS"
+CPATH="$pthbs_build_environment/include"
+LDFLAGS="-static -L$pthbs_build_environment/library"
 UTF8_LOCALE="en_US.UTF-8"
 MANPATH_DEFAULT=/run/current/man
 MANPATH_BASE=/run/current/man
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -85,5 +85,5 @@
 #+findutils.d9e7f71704cf89d5bb127931d1c1a27f4fe40879b7733a8f8c71a86a0c31c632
 #+nawk.e4d02d09a25319411ab52938892bddcd7f7b715f21da1757ded6b98c56780811
 #+squashfs-tools.dc473cbcc9137cefd0d45d7da5520b8e91a2582a1cc7bd1695418c4d7f4e3fcc
-#+mandoc.84ee35bf3049dfe8304a57b18628b688ee11f64622980807adbbd53079212662
+#+mandoc.f02f74a60b304a889acbf8207a6fb4251f1d6be0084a3ef6f65c7ccb3a1bebb4
 #+tinyssh.4d3bf98f61e15fcd7a507894d94ebf81db347202142d0316c18ee3d8c83a45e2 
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -85,7 +85,7 @@
 #+findutils.c5d57b426ce840b3135a17d4dfaf636ce77e54561e672ccdb52768f56410a412
 #+nawk.027a855f9a315e50ae9794f569c1009012298e0ca101460ab1189ab1e87a536b
 #+squashfs-tools.3709841b2a7fb047746b6fba97d121ff5562313dcf931a1cc52127715e3877bc
-#+mandoc.24425c533a07e971c9b2184d22585816691b7d9d7df4c0af7a1f3cbb90dcbc57
+#+mandoc.8d8c073273a43b8e3c268d809276d7cafe749ad7894d83068f1c4d6ffe3e23cd
 #+tinyssh.61b867705313e16b0e54554cd896f3610c1a85367babe162d5c76e21acf83807
 #+system-config.2f0130974f0e967b6a723a20a797aac82a53b9d72a17632c831eea91cece7486
 #+system-config-rc.3683c44183f40a826359d33b59796a6f82a4228706d05943f32b422eae6a5fc7
diff --git a/variants/root-x86_64/mandoc b/variants/root-x86_64/mandoc
@@ -34,12 +34,6 @@
 
 # - build script start -
 
-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"
-}
-
 check_static() {
 	local exe || true
 	exe=$pthbs_destdir'/versions'/$pthbs_package/$1
@@ -59,12 +53,13 @@ prefix=/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd 'mandoc-1.14.6'
 
-build_env_static
+export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 cat >configure.local<<-__EOF__
 PREFIX="$prefix"
 MANDIR="$prefix/man"
 LIBDIR="$prefix/library"
-CFLAGS="$CFLAGS"
+CPATH="$pthbs_build_environment/include"
+LDFLAGS="-static -L$pthbs_build_environment/library"
 UTF8_LOCALE="en_US.UTF-8"
 MANPATH_DEFAULT=/run/current/man
 MANPATH_BASE=/run/current/man
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -85,5 +85,5 @@
 #+findutils.c5d57b426ce840b3135a17d4dfaf636ce77e54561e672ccdb52768f56410a412
 #+nawk.027a855f9a315e50ae9794f569c1009012298e0ca101460ab1189ab1e87a536b
 #+squashfs-tools.3709841b2a7fb047746b6fba97d121ff5562313dcf931a1cc52127715e3877bc
-#+mandoc.24425c533a07e971c9b2184d22585816691b7d9d7df4c0af7a1f3cbb90dcbc57
+#+mandoc.8d8c073273a43b8e3c268d809276d7cafe749ad7894d83068f1c4d6ffe3e23cd
 #+tinyssh.61b867705313e16b0e54554cd896f3610c1a85367babe162d5c76e21acf83807 
\ No newline at end of file