Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2cc3b355a570d60b8f572188ccff6b7daea3760e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2cc3b355a570d60b8f572188ccff6b7daea3760e)
  • Date: Tue, 7 May 2019 00:48:36 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

crypto/gpgme/BUILD | 14 +++++++++++---
crypto/gpgme/CONFIGURE | 13 ++++---------
crypto/gpgme/DEPENDS | 23 ++++++-----------------
crypto/gpgme/HISTORY | 3 +++
4 files changed, 24 insertions(+), 29 deletions(-)

New commits:
commit 2cc3b355a570d60b8f572188ccff6b7daea3760e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gpgme: Fix language bindings selection

Use dependencies to choose, except for C++.

diff --git a/crypto/gpgme/BUILD b/crypto/gpgme/BUILD
index 85f6ef7..ff4e621 100755
--- a/crypto/gpgme/BUILD
+++ b/crypto/gpgme/BUILD
@@ -1,7 +1,15 @@
-if is_depends_enabled $SPELL qtbase; then
+GPG_LANG=no
+if [ "$GPG_LANG_CXX" = y ]; then
+ GPG_LANG=cpp
+fi &&
+if is_depends_enabled "$SPELL" qtbase; then
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
export PATH+=":$QT5DIR/bin"
+ GPG_LANG="$GPG_LANG,qt"
+fi &&
+if is_depends_enabled "$SPELL" python3 ||
+ is_depends_enabled "$SPELL" python; then
+ GPG_LANG="$GPG_LANG,python"
fi &&
-OPTS+=" --enable-languages=${GPG_LANG/ /,}" &&
+OPTS+=" --enable-languages=${GPG_LANG#no,}" &&
default_build
-
diff --git a/crypto/gpgme/CONFIGURE b/crypto/gpgme/CONFIGURE
index d49fb0a..fbee4f0 100755
--- a/crypto/gpgme/CONFIGURE
+++ b/crypto/gpgme/CONFIGURE
@@ -1,9 +1,4 @@
-source $GRIMOIRE/config_query_multi.function
-case $GPGME_BRANCH in
- 1.[7-9] | 1.1[0-2])
- config_query_multi GPG_LANG "which languages bindings to support" \
- qt c++ python
- ;;
- *)
- ;;
-esac
+if [ -n "$GPG_LANG" ]; then
+ persistent_remove GPG_LANG
+fi
+config_query GPG_LANG_CXX "build C++ bindings" y
diff --git a/crypto/gpgme/DEPENDS b/crypto/gpgme/DEPENDS
index aae92e7..b7720b9 100755
--- a/crypto/gpgme/DEPENDS
+++ b/crypto/gpgme/DEPENDS
@@ -1,20 +1,9 @@
-. "${GRIMOIRE}/FUNCTIONS" &&
depends libgpg-error &&
depends pkgconfig &&
depends GNUPG &&
-
-case $GPGME_BRANCH in
- 1.[7-9] | 1.1[0-3])
- if list_find "$GPG_LANG" qt; then
- depends qtbase &&
- depends -sub CXX gcc
- fi &&
-
- if list_find "$GPG_LANG" python; then
- depends swig &&
- depends PYTHON
- fi
- ;;
- *)
- ;;
-esac
+optional_depends qtbase '' '' 'for QT bindings' &&
+optional_depends PYTHON '' '' 'for Python bindings' &&
+if is_depends_enabled "$SPELL" python3 ||
+ is_depends_enabled "$SPELL" python; then
+ depends swig
+fi
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 3788a0f..2191027 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,6 @@
+2019-05-07 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFIGURE: Fixed language bindings selection
+
2019-04-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.13.0
* DEPENDS PREPARE: add 1.13 branch



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2cc3b355a570d60b8f572188ccff6b7daea3760e), Ismael Luceno, 05/06/2019

Archive powered by MHonArc 2.6.24.

Top of Page