Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Conner Clere (f46fc6612c660fa31eea89fb1aac1b5f5af947d2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Conner Clere (f46fc6612c660fa31eea89fb1aac1b5f5af947d2)
  • Date: Wed, 18 Jan 2023 20:29:56 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

crypto/p11-kit/BUILD | 6 +++---
crypto/p11-kit/HISTORY | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit f46fc6612c660fa31eea89fb1aac1b5f5af947d2
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

p11-kit: fix BUILD to use is_depends_enabled

diff --git a/crypto/p11-kit/BUILD b/crypto/p11-kit/BUILD
index af495b6..bb3ffcc 100755
--- a/crypto/p11-kit/BUILD
+++ b/crypto/p11-kit/BUILD
@@ -1,5 +1,5 @@
-if [[ $OPTS = *trust_module=enabled* ]]; then
- TRUST=(trust_paths="${INSTALL_ROOT}/etc/ssl/certs/ca-certificates.crt") &&
- OPTS="${TRUST[@]} $OPTS"
+if is_depends_enabled $SPELL ca-certificates; then
+ local
trust=(trust_paths="${INSTALL_ROOT}/etc/ssl/certs/ca-certificates.crt") &&
+ OPTS="${trust[@]} $OPTS"
fi &&
meson_build
diff --git a/crypto/p11-kit/HISTORY b/crypto/p11-kit/HISTORY
index f7e9dfb..bd85b34 100644
--- a/crypto/p11-kit/HISTORY
+++ b/crypto/p11-kit/HISTORY
@@ -1,4 +1,8 @@
2023-01-18 Conner Clere <xenanthropy AT sourcemage.org>
+ * BUILD: change if statement to use is_depends_enabled,
+ make trust variable local
+
+2023-01-18 Conner Clere <xenanthropy AT sourcemage.org>
* BUILD: added, plug in path to trust modules
* DEPENDS: deps added: systemd (optional), ca-certificates
and libtasn1 (optional), PKG-CONFIG;



  • [SM-Commit] GIT changes to master grimoire by Conner Clere (f46fc6612c660fa31eea89fb1aac1b5f5af947d2), Conner Clere, 01/18/2023

Archive powered by MHonArc 2.6.24.

Top of Page