[git] gnupg-doc - branch, master, updated. ca620a23d9f5b25ed58be0c9f3dae10251dfc6c0

[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  ca620a23d9f5b25ed58be0c9f3dae10251dfc6c0 (commit)
       via  47cb17b41070317543a6907911b0640d651ca85f (commit)
       via  18057085478bef22ffb1963bae815ff4ecf39c9c (commit)
      from  538b6dec949b89247963ba90e676c2dd87c32db7 (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 ca620a23d9f5b25ed58be0c9f3dae10251dfc6c0
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jan 12 12:27:15 2017 +0100

    jenkins: add notes on the openbsd installation

diff --git a/misc/jenkins/README.org b/misc/jenkins/README.org
index 8691018..0fe24c7 100644
--- a/misc/jenkins/README.org
+++ b/misc/jenkins/README.org
@@ -10,3 +10,16 @@ and a build tree at
   $HOME/src/gpgme-for-gnupgs-tests/obj
 
 The tests from there are executed in GnuPG's test suite.
+* Virtual machines
+** openbsd60
+Packages installed:
+
+  # pkg_add zile zsh git autoconf-2.69p2 automake-1.15p0 gettext-tools \
+    gmake xfig bison readline libusb-compat ImageMagick makeinfo
+
+Add some compatibility links to PATH:
+
+  $ mkdir compat
+  $ cd compat
+  $ ln -s /usr/local/bin/gmakeinfo makeinfo
+  $ [ add $HOME/compat to ~/.profile ]

commit 47cb17b41070317543a6907911b0640d651ca85f
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jan 12 12:25:25 2017 +0100

    jenkins: explicitly point configure to iconv on openbsd

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index 84777c8..87f0037 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -110,6 +110,9 @@ case "$JOB_NAME" in
 	if [ "$NODE_NAME" = zygalski ]; then
 	    CONFIGUREFLAGS="$CONFIGUREFLAGS --with-libiconv-prefix=$HOME/pkg"
 	fi
+	if [ "$NODE_NAME" = openbsd60 ]; then
+	    CONFIGUREFLAGS="$CONFIGUREFLAGS --with-libiconv-prefix=/usr/local"
+	fi
         ;;
 esac
 

commit 18057085478bef22ffb1963bae815ff4ecf39c9c
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jan 12 12:22:38 2017 +0100

    jenkins: honor CFLAGS, fixes gpgme build on macos

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index 4869979..84777c8 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -130,7 +130,9 @@ case "$XTARGET" in
     native)
         ../configure --prefix=$PREFIX --enable-maintainer-mode \
 	           $CONFIGUREFLAGS \
-	           "$CONFIGUREFLAGS_0"
+	           "$CONFIGUREFLAGS_0" \
+		   CFLAGS="$CFLAGS" \
+	           CXXFLAGS="$CXXFLAGS -std=c++11"
         $MAKE $MAKEFLAGS
 
         $MAKE -k check verbose=2 || true

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

Summary of changes:
 misc/jenkins/README.org     | 13 +++++++++++++
 misc/jenkins/bin/build.bash |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)


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