[git] gnupg-doc - branch, master, updated. 7a6a12e6aa916f4b09910d34df7ca16049edee86

[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  7a6a12e6aa916f4b09910d34df7ca16049edee86 (commit)
      from  d37ee56b510b20300bee5a7ffe70e3204e93c160 (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 7a6a12e6aa916f4b09910d34df7ca16049edee86
Author: Justus Winter <justus at g10code.com>
Date:   Mon Feb 13 12:34:53 2017 +0100

    jenkins: use the same gnupg configuration for all unix targets

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index 3dbc58b..68e1ee7 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -89,12 +89,19 @@ case "$JOB_NAME" in
         fi
         ;;
     *gnupg*)
-        if [ "$XTARGET" = native ]; then
-            CONFIGUREFLAGS="--enable-wks-tools --enable-g13 --enable-symcryptrun --enable-gpg2-is-gpg"
-        fi
+	# Common configure options.
+	CONFIGUREFLAGS="--enable-wks-tools --enable-gpg2-is-gpg"
+
+	# For Windows builds...
         if [ "$XTARGET" = w32 ]; then
-            CONFIGUREFLAGS="--enable-wks-tools --enable-gpg2-is-gpg --with-zlib=$ORIGINAL_PREFIX --with-bzip2=$ORIGINAL_PREFIX"
+	    # ... we need to tweak it a little and we leave out some
+	    # stuff...
+            CONFIGUREFLAGS="$CONFIGUREFLAGS --with-zlib=$ORIGINAL_PREFIX --with-bzip2=$ORIGINAL_PREFIX"
+	else
+	    # ... that we enable for all other builds.
+	    CONFIGUREFLAGS="$CONFIGUREFLAGS --enable-g13 --enable-symcryptrun"
         fi
+
 	if [ "$NODE_NAME" = zygalski ]; then
 	    CONFIGUREFLAGS="$CONFIGUREFLAGS --with-libiconv-prefix=$HOME/pkg"
 	fi

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

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


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