[git] gnupg-doc - branch, master, updated. 3092e9211c9bf6498778640b7208a80146d023da

[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  3092e9211c9bf6498778640b7208a80146d023da (commit)
       via  34f8183f294e2000c9c0b26d3629b4fe42cdcaf9 (commit)
      from  5580a638b4f265e8d957289b59dc6656a33b9d50 (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 3092e9211c9bf6498778640b7208a80146d023da
Author: Justus Winter <justus at g10code.com>
Date:   Mon May 8 15:24:25 2017 +0200

    jenkins: avoid using build artifacts during builds

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index 3155f63..eb17834 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -33,7 +33,18 @@ fi
 # Setup important envars
 PREFIX=$HOME/prefix/$XTARGET
 ORIGINAL_PREFIX=$HOME/prefix/$XTARGET
-export PATH=$PREFIX/bin:$PATH
+
+# hackhackhack
+#
+# Copy all *-config scripts into a separate directory and put that
+# into PATH.  We want configure to pick them up, but we do not
+# necessarily want to use all the other tools from $PREFIX/bin,
+# because then we would have to point LD_LIBRARY_PATH to $PREFIX/lib,
+# which we want to avoid at all costs.
+mkdir -p $PREFIX/bin-config
+cp $PREFIX/bin/*-config $PREFIX/bin-config
+export PATH=$PREFIX/bin-config:$PATH
+# kcahkcahkcah
 
 # Tweak the prefix we're installing this project into.  For gnupg-1.4
 # and friends.

commit 34f8183f294e2000c9c0b26d3629b4fe42cdcaf9
Author: Justus Winter <justus at g10code.com>
Date:   Mon May 8 15:23:16 2017 +0200

    jenkins: use default XTARGET for testing with simpler setups

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index 0e9a698..3155f63 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -8,6 +8,8 @@ renice -n 10 -p $$
 # Configuration.
 MAKE=make
 
+XTARGET="${XTARGET:-native}"
+
 # Platform-specific configuration.
 case "$(uname)" in
     OpenBSD)

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

Summary of changes:
 misc/jenkins/bin/build.bash | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)


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