[git] GPG-ERROR - branch, master, updated. libgpg-error-1.32-31-gf575b2f
by NIIBE Yutaka
cvs at cvs.gnupg.org
Tue Oct 23 07:01:13 CEST 2018
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 "Error codes used by GnuPG et al.".
The branch, master has been updated
via f575b2fd3f733d78fb61b04805ea63ce65d89e19 (commit)
from 40e22c774afebca23fdaa6dec2b8698572501c32 (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 f575b2fd3f733d78fb61b04805ea63ce65d89e19
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Tue Oct 23 13:54:10 2018 +0900
build: Supply CC to invoke gpg-error-config.
* src/gpg-error.m4: Add CC when invoking gpg-error-config.
* src/gpgrt.m4: Likewise.
--
For standard cross build, the use of --with-libgpg-error-prefix will
not be needed, as the script automatically finds the place.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index 0564219..9f26fa4 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
@@ -70,7 +70,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_gpg_error_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
+ gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --version`
major=`echo $gpg_error_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $gpg_error_config_version | \
@@ -86,15 +86,15 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
fi
if test $ok = yes; then
- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --variable=mtcflags 2>/dev/null`
+ GPG_ERROR_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
+ GPG_ERROR_LIBS=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --libs`
+ GPG_ERROR_MT_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --variable=mtcflags 2>/dev/null`
GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS"
- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --variable=mtlibs 2>/dev/null`
+ GPG_ERROR_MT_LIBS=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --variable=mtlibs 2>/dev/null`
GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
AC_MSG_RESULT([yes ($gpg_error_config_version)])
ifelse([$2], , :, [$2])
- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --variable=host 2>/dev/null || echo none`
+ gpg_error_config_host=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --variable=host 2>/dev/null || echo none`
if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then
AC_MSG_WARN([[
diff --git a/src/gpgrt.m4 b/src/gpgrt.m4
index 8c2b6f9..179f7ae 100644
--- a/src/gpgrt.m4
+++ b/src/gpgrt.m4
@@ -73,7 +73,7 @@ AC_DEFUN([AM_PATH_GPGRT],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_gpgrt_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
- gpgrt_config_version=`$GPGRT_CONFIG $gpgrt_config_args --version`
+ gpgrt_config_version=`CC=$CC $GPGRT_CONFIG $gpgrt_config_args --version`
major=`echo $gpgrt_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $gpgrt_config_version | \
@@ -89,13 +89,15 @@ AC_DEFUN([AM_PATH_GPGRT],
fi
fi
if test $ok = yes; then
- GPGRT_CFLAGS=`$GPGRT_CONFIG $gpgrt_config_args --cflags`
- GPGRT_LIBS=`$GPGRT_CONFIG $gpgrt_config_args --libs`
- GPGRT_MT_CFLAGS=`$GPGRT_CONFIG $gpgrt_config_args --mt --cflags 2>/dev/null`
- GPGRT_MT_LIBS=`$GPGRT_CONFIG $gpgrt_config_args --mt --libs 2>/dev/null`
+ GPGRT_CFLAGS=`CC=$CC $GPGRT_CONFIG $gpgrt_config_args --cflags`
+ GPGRT_LIBS=`CC=$CC $GPGRT_CONFIG $gpgrt_config_args --libs`
+ GPGRT_MT_CFLAGS=`CC=$CC $GPGRT_CONFIG $gpgrt_config_args --mtcflags 2>/dev/null`
+ GPGRT_MT_CFLAGS="$GPGRT_CFLAGS${GPGRT_CFLAGS:+ }$GPGRT_MT_CFLAGS"
+ GPGRT_MT_LIBS=`CC=$CC $GPGRT_CONFIG $gpgrt_config_args --mtlibs 2>/dev/null`
+ GPGRT_MT_LIBS="$GPGRT_LIBS${GPGRT_LIBS:+ }$GPGRT_MT_LIBS"
AC_MSG_RESULT([yes ($gpgrt_config_version)])
ifelse([$2], , :, [$2])
- gpgrt_config_host=`$GPGRT_CONFIG $gpgrt_config_args --host 2>/dev/null || echo none`
+ gpgrt_config_host=`CC=$CC $GPGRT_CONFIG $gpgrt_config_args --variable=host 2>/dev/null || echo none`
if test x"$gpgrt_config_host" != xnone ; then
if test x"$gpgrt_config_host" != x"$host" ; then
AC_MSG_WARN([[
-----------------------------------------------------------------------
Summary of changes:
src/gpg-error.m4 | 12 ++++++------
src/gpgrt.m4 | 14 ++++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
hooks/post-receive
--
Error codes used by GnuPG et al.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list