[git] gnupg-doc - branch, master, updated. 511b98531376725925051257a82670365a444c2b

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  511b98531376725925051257a82670365a444c2b (commit)
      from  5e04efa25c45ff311be080ed07c245ef67746216 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 511b98531376725925051257a82670365a444c2b
Author: Justus Winter <justus at g10code.com>
Date:   Mon Mar 27 17:19:57 2017 +0200

    jenkins: make sure the linker uses gpgme from build dir (take two)

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index 425bb1d..c5a7fda 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -120,6 +120,18 @@ case "$JOB_NAME" in
         ;;
 esac
 
+# See if we have a GPGME checkout for the tesets.
+xtest_gpgme_srcdir="$HOME/src/gpgme-for-gnupgs-tests"
+if [ -d "$xtest_gpgme_srcdir/obj-$XTARGET" ]; then
+    # Some targets, like the sanitizer target, require a custom
+    # version of GPGME.
+    export XTEST_GPGME_SRCDIR="$xtest_gpgme_srcdir"
+    export XTEST_GPGME_BUILDDIR="$xtest_gpgme_srcdir/obj-$XTARGET"
+elif [ -d "$xtest_gpgme_srcdir/obj" ]; then
+    export XTEST_GPGME_SRCDIR="$xtest_gpgme_srcdir"
+    export XTEST_GPGME_BUILDDIR="$xtest_gpgme_srcdir/obj"
+fi
+
 # The libraries use RUNPATH when linking the tests, so they locate
 # their dependencies that way.  GnuPG, however, does not.  Therefore,
 # we set LD_LIBRARY_PATH.
@@ -131,6 +143,11 @@ test_environment="LD_LIBRARY_PATH=$ORIGINAL_PREFIX/lib"
 # RUNPATH has lower precedence than LD_LIBRARY_PATH, we need to
 # explicitly add libtool's .libs directory:
 case "$JOB_NAME" in
+  *gnupg*)
+    if [ "${XTEST_GPGME_BUILDDIR}" ]; then
+	test_environment="LD_LIBRARY_PATH=${XTEST_GPGME_BUILDDIR}/src/.libs:${XTEST_GPGME_BUILDDIR}/lang/cpp/src/.libs:${XTEST_GPGME_BUILDDIR}/lang/qt/src/.libs:$ORIGINAL_PREFIX/lib"
+    fi
+    ;;
   *gpgme*)
     test_environment="LD_LIBRARY_PATH=$(pwd)/obj/src/.libs:$(pwd)/obj/lang/cpp/src/.libs:$(pwd)/obj/lang/qt/src/.libs:$ORIGINAL_PREFIX/lib"
     ;;
@@ -145,18 +162,6 @@ esac
 #
 # KCAHKCAHKCAH
 
-# See if we have a GPGME checkout for the tesets.
-xtest_gpgme_srcdir="$HOME/src/gpgme-for-gnupgs-tests"
-if [ -d "$xtest_gpgme_srcdir/obj-$XTARGET" ]; then
-    # Some targets, like the sanitizer target, require a custom
-    # version of GPGME.
-    export XTEST_GPGME_SRCDIR="$xtest_gpgme_srcdir"
-    export XTEST_GPGME_BUILDDIR="$xtest_gpgme_srcdir/obj-$XTARGET"
-elif [ -d "$xtest_gpgme_srcdir/obj" ]; then
-    export XTEST_GPGME_SRCDIR="$xtest_gpgme_srcdir"
-    export XTEST_GPGME_BUILDDIR="$xtest_gpgme_srcdir/obj"
-fi
-
 # We build on the "obj" subdir.
 abs_configure="$(pwd)/configure"
 mkdir -p obj
@@ -275,6 +280,11 @@ case "$XTARGET" in
 	  # LD_LIBRARY_PATH, we need to explicitly add libtool's .libs
 	  # directory:
 	  case "$JOB_NAME" in
+	    *gnupg*)
+	      if [ "${XTEST_GPGME_BUILDDIR}" ]; then
+		  test_environment="LD_LIBRARY_PATH=${XTEST_GPGME_BUILDDIR}/src/.libs:${XTEST_GPGME_BUILDDIR}/lang/cpp/src/.libs:${XTEST_GPGME_BUILDDIR}/lang/qt/src/.libs:$ORIGINAL_PREFIX/lib"
+	      fi
+	      ;;
 	    *gpgme*)
 	      test_environment="LD_LIBRARY_PATH=$(pwd)/${tarname}/_build/sub/src/.libs:$(pwd)/${tarname}/_build/sub/lang/cpp/src/.libs:$(pwd)/${tarname}/_build/sub/lang/qt/src/.libs:$ORIGINAL_PREFIX/lib"
 	      ;;

-----------------------------------------------------------------------

Summary of changes:
 misc/jenkins/bin/build.bash | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org