[git] gnupg-doc - branch, master, updated. 7376a79234e490dc45819ee876b1eeb9e256874c

[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  7376a79234e490dc45819ee876b1eeb9e256874c (commit)
      from  38285aa017893048e2ec661ed9b72617306bf330 (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 7376a79234e490dc45819ee876b1eeb9e256874c
Author: Justus Winter <justus at g10code.com>
Date:   Mon Mar 27 14:17:10 2017 +0200

    jenkins: make sure that the runtime linker uses gpgme from build dir

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index e378704..425bb1d 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -130,7 +130,14 @@ test_environment="LD_LIBRARY_PATH=$ORIGINAL_PREFIX/lib"
 # Because newer Debian toolchains prefer RUNPATH over RPATH, and
 # RUNPATH has lower precedence than LD_LIBRARY_PATH, we need to
 # explicitly add libtool's .libs directory:
-test_environment="LD_LIBRARY_PATH=$(pwd)/obj/src/.libs:$ORIGINAL_PREFIX/lib"
+case "$JOB_NAME" in
+  *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"
+    ;;
+  *)
+    test_environment="LD_LIBRARY_PATH=$(pwd)/obj/src/.libs:$ORIGINAL_PREFIX/lib"
+    ;;
+esac
 #
 # If we don't do this, the version tests fail because the runtime
 # linker will pick up the library from LD_LIBRARY_PATH.  Also, testing
@@ -267,7 +274,14 @@ case "$XTARGET" in
 	  # RUNPATH over RPATH, and RUNPATH has lower precedence than
 	  # LD_LIBRARY_PATH, we need to explicitly add libtool's .libs
 	  # directory:
-	  test_environment="LD_LIBRARY_PATH=$(pwd)/${tarname}/_build/sub/src/.libs:$ORIGINAL_PREFIX/lib"
+	  case "$JOB_NAME" in
+	    *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"
+	      ;;
+	    *)
+	      test_environment="LD_LIBRARY_PATH=$(pwd)/${tarname}/_build/sub/src/.libs:$ORIGINAL_PREFIX/lib"
+	      ;;
+	  esac
 	  # KCAHKCAHKCAH
 
 	  if ! env $test_environment $MAKE $MAKEFLAGS distcheck ; then

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

Summary of changes:
 misc/jenkins/bin/build.bash | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)


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