From 2113e5155b0e4d12e541aa1825069912b21ccfea Mon Sep 17 00:00:00 2001 From: Toni Date: Sat, 21 Feb 2026 18:39:02 +0100 Subject: [PATCH] finally skip perl & openssl docs --- packages/libopenssl.shrap | 4 +++- packages/libsodium.shrap | 12 ++++++++++++ packages/mkp224o.shrap | 14 ++++++++++++++ packages/perl.shrap | 2 +- src/main.cc | 24 ++++++++++++++++++++++-- 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 packages/libsodium.shrap create mode 100644 packages/mkp224o.shrap diff --git a/packages/libopenssl.shrap b/packages/libopenssl.shrap index c710433..f8c6243 100644 --- a/packages/libopenssl.shrap +++ b/packages/libopenssl.shrap @@ -9,6 +9,8 @@ (blake3 "90c0c093c5f09397f840cce374e4e6f56134727ac0867aaeccb5314aa3196544"))) (build (shell "./Configure linux-x86_64 shared --prefix=/usr --libdir=lib") - (make) + (make + (do_install no)) + (shell "make install_sw") (shell "cp -v /usr/lib/libssl.so.3 /lib/x86_64-linux-gnu/libssl.so.3 || true") (shell "cp -v /usr/lib/libcrypto.so.3 /lib/x86_64-linux-gnu/libcrypto.so.3 || true"))) diff --git a/packages/libsodium.shrap b/packages/libsodium.shrap new file mode 100644 index 0000000..3aaef64 --- /dev/null +++ b/packages/libsodium.shrap @@ -0,0 +1,12 @@ +(package + (name "libsodium") + (version "1.0.21-stable") + (homepage "https://libsodium.gitbook.io/doc") + (dependencies make) + (src (tar + (url "https://download.libsodium.org/libsodium/releases/libsodium-1.0.21-stable.tar.gz") + (dir "libsodium-stable") + (blake3 "cba92d24061a7853a5735797e58165d5008f75de96a75ee2feea636e2e6e5762"))) + (build + (configure_make + (configure_flags "--disable-shared")))) diff --git a/packages/mkp224o.shrap b/packages/mkp224o.shrap new file mode 100644 index 0000000..4dc70f4 --- /dev/null +++ b/packages/mkp224o.shrap @@ -0,0 +1,14 @@ +(package + (name "mkp224o") + (version "1.7.0") + (homepage "https://github.com/cathugger/mkp224o") + (dependencies libsodium) + (src (tar + (url "https://github.com/cathugger/mkp224o/releases/download/v1.7.0/mkp224o-1.7.0-src.tar.gz") + (dir "mkp224o-1.7.0") + (blake3 "a3f2a27c57a623cb67de62b52808a76005891f000295c7267506f448f3d32622"))) + (build + (configure_make + (configure_flags "--enable-amd64-64-24k --enable-intfilter") + (do_install no)) + (shell "mv -v mkp224o /usr/bin/"))) diff --git a/packages/perl.shrap b/packages/perl.shrap index 55b3a31..9e81879 100644 --- a/packages/perl.shrap +++ b/packages/perl.shrap @@ -8,5 +8,5 @@ (dir "perl-5.42.0") (blake3 "9d3e6aee850d69fb90c629a9e435da75f67c9ee0461d6e3e2c100e64f27fa9a5"))) (build - (shell "./Configure -des") + (shell "./Configure -des -DNO_POD2MAN=1 -DNO_POD2HTML=1") (make))) diff --git a/src/main.cc b/src/main.cc index 3effb3d..225b658 100644 --- a/src/main.cc +++ b/src/main.cc @@ -133,11 +133,29 @@ void install_package(const std::string &name, DB &db) { } catch (std::out_of_range &) { } + bool do_install = true; + try { + if (step.get_one("do_install").value == "no") { + do_install = false; + } + } catch (std::out_of_range &) { + } + Util::shell_command("./configure --prefix=/usr " + configure_flags, src_path); Util::shell_command("make -j " + jobs, src_path); - Util::shell_command("make install", src_path); + if (do_install) { + Util::shell_command("make install", src_path); + } } else if (step_type == "make") { + bool do_install = true; + try { + if (step.get_one("do_install").value == "no") { + do_install = false; + } + } catch (std::out_of_range &) { + } + std::string make_flags; try { make_flags = step.get_one("make_flags").value; @@ -150,7 +168,9 @@ void install_package(const std::string &name, DB &db) { } Util::shell_command("make " + make_flags + " -j " + jobs, src_path); - Util::shell_command("make install " + install_flags, src_path); + if (do_install) { + Util::shell_command("make install " + install_flags, src_path); + } } else if (step_type == "cmake") { std::string configure_flags; try {