pthbs

Packaging Through Hashed Build Scripts
git clone https://ccx.te2000.cz/git/pthbs
Log | Files | Refs | Submodules | README

commit 8afe4181eee4f9361470c8b4dd8119a35a6ff78e
parent fffc8223b4f04742995ead48742dc057c2f5d191
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 22 Feb 2024 15:52:17 +0100

Avoid needing perl to generate curl manpage

Diffstat:
Mpackages/curl | 10++++++++--
Mpackages/default.environment | 2+-
Mpackages/userspace.environment | 4++--
Mtemplates/pkg/curl | 10++++++++--
4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/curl b/packages/curl @@ -62,7 +62,11 @@ check_static() { -autotools_static curl-8.6.0 --disable-nls \ +# Do not generate manpage (requires Perl) +touch curl-8.6.0/doc/curl.1 + +autotools_static curl-8.6.0 \ + --with-zlib \ --enable-ipv6 \ --enable-unix-sockets \ --enable-static \ @@ -74,6 +78,8 @@ autotools_static curl-8.6.0 --disable-nls \ --disable-manual check_static command/curl +rm $pthbs_destdir/home/ccx/versions/$pthbs_package/man/1/curl.1" + make -C curl-8.6.0/tests @@ -82,7 +88,7 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/curl"]=1 - x["./library/libcurla"]=1 + x["./library/libcurl.a"]=1 } function r1(s) { diff --git a/packages/default.environment b/packages/default.environment @@ -24,7 +24,7 @@ #+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0 #+logincaps.8e9f7e96eef8efbff3010abce4a360be2ab9c8675e2f90aaf4375bebf32e16f3 #+snaprep.9fc58ee4729913adada7f715d37f7af5b6ef324f46e73b27ea939323b83c5a46 -#+curl.7e3b4ad51e80865c3cc3a5d9166915ea54e9ac5a3b042010ccb4500913664bbf +#+curl.542c7ed84fccae4d07d4a7f90c9713a5b1a640a7c1570e35515a183f5c8ae567 #+linux.c21eb54792cc5b7c4df9de554a3c4b1bd6f15cf18764d359b9dafaa017d6d863 #+core-system-conf.ee44833f65709792d6a577809e1b59b2d21c647b8a9c34ca560c351bea6ddc85 #+core-system-rc.d1343a44b2baa7d2732a7de0df109009c04d81dbe6d22964887f5af83598179c diff --git a/packages/userspace.environment b/packages/userspace.environment @@ -24,4 +24,4 @@ #+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0 #+logincaps.8e9f7e96eef8efbff3010abce4a360be2ab9c8675e2f90aaf4375bebf32e16f3 #+snaprep.9fc58ee4729913adada7f715d37f7af5b6ef324f46e73b27ea939323b83c5a46 -#+curl.7e3b4ad51e80865c3cc3a5d9166915ea54e9ac5a3b042010ccb4500913664bbf- \ No newline at end of file +#+curl.542c7ed84fccae4d07d4a7f90c9713a5b1a640a7c1570e35515a183f5c8ae567+ \ No newline at end of file diff --git a/templates/pkg/curl b/templates/pkg/curl @@ -5,7 +5,11 @@ {%- endblock %} {% block at_script %} -autotools_static curl-8.6.0 --disable-nls \ +# Do not generate manpage (requires Perl) +touch curl-8.6.0/doc/curl.1 + +autotools_static curl-8.6.0 \ + --with-zlib \ --enable-ipv6 \ --enable-unix-sockets \ --enable-static \ @@ -17,10 +21,12 @@ autotools_static curl-8.6.0 --disable-nls \ --disable-manual check_static command/curl +rm $pthbs_destdir{{versions}}/$pthbs_package/man/1/curl.1" + make -C curl-8.6.0/tests {% endblock %} {% block genlinks_begin %} x["./command/curl"]=1 - x["./library/libcurla"]=1 + x["./library/libcurl.a"]=1 {% endblock %}