[git] GCRYPT - branch, master, updated. libgcrypt-1.8.1-95-gc60eabb
by NIIBE Yutaka
cvs at cvs.gnupg.org
Wed Oct 24 08:26:10 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 "The GNU crypto library".
The branch, master has been updated
via c60eabb11435665fa84a3a82b2a15f48870cc4d7 (commit)
via 7da887d69d72ea0ea0d106054c48a8c03e242a18 (commit)
via 97194b422bc89a6137f4e218d4cdee118c63e96e (commit)
via 5b1febb5e40d92072bef425bd9e63f7a07edd57e (commit)
via 0f4545b441b6fbdd6e9c4e95f5f2a367483e78ad (commit)
from e2da4e8dee4b371804f3b2659b53431fb6380d93 (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 c60eabb11435665fa84a3a82b2a15f48870cc4d7
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 15:13:40 2018 +0900
build: Compatibility to pkg-config.
* src/libgcrypt-config.in: Support --variable and --modversion.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in
index f7a13af..6b3b356 100644
--- a/src/libgcrypt-config.in
+++ b/src/libgcrypt-config.in
@@ -96,7 +96,19 @@ while test $# -gt 0; do
--exec-prefix)
echo_exec_prefix=yes
;;
- --version)
+ --variable=*)
+ case "${1#*=}" in
+ prefix) echo "$prefix" ;;
+ exec_prefix) echo "$exec_prefix" ;;
+ host) echo "$my_host" ;;
+ api_version) echo "$api_version" ;;
+ symmetric_ciphers) echo "$symmetric_ciphers" ;;
+ asymmetric_ciphers) echo "$asymmetric_ciphers" ;;
+ digests) echo "$digests" ;;
+ esac
+ exit 0
+ ;;
+ --modversion|--version)
echo_version=yes
;;
--api-version)
commit 7da887d69d72ea0ea0d106054c48a8c03e242a18
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 15:07:18 2018 +0900
build: Make libgcrypt.m4 use gpg-error-config.
* src/libgcrypt.m4: Use gpg-error-config.
--
With the option --with-libgcrypt-prefix, it still keeps using
libgcrypt-config script.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
index c67cfec..df6469d 100644
--- a/src/libgcrypt.m4
+++ b/src/libgcrypt.m4
@@ -1,5 +1,5 @@
# libgcrypt.m4 - Autoconf macros to detect libgcrypt
-# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018 g10 Code GmbH
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -9,7 +9,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-# Last-changed: 2014-10-02
+# Last-changed: 2018-10-24
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -29,6 +29,7 @@ dnl is added to the gpg_config_script_warn variable.
dnl
AC_DEFUN([AM_PATH_LIBGCRYPT],
[ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AM_PATH_GPG_ERROR])
AC_ARG_WITH(libgcrypt-prefix,
AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
[prefix where LIBGCRYPT is installed (optional)]),
@@ -44,15 +45,16 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
fi
;;
'')
+ LIBGCRYPT_CONFIG="$GPG_ERROR_CONFIG libgcrypt"
;;
*)
+ LIBGCRYPT_CONFIG="$GPG_ERROR_CONFIG libgcrypt"
AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
;;
esac
fi
fi
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
tmp=ifelse([$1], ,1:1.2.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@@ -71,7 +73,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
req_micro=`echo $min_libgcrypt_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+ libgcrypt_config_version=`CC=$CC $LIBGCRYPT_CONFIG --modversion`
major=`echo $libgcrypt_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $libgcrypt_config_version | \
@@ -103,7 +105,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
# If we have a recent libgcrypt, we should also check that the
# API is compatible
if test "$req_libgcrypt_api" -gt 0 ; then
- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+ tmp=`CC=$CC $LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([LIBGCRYPT API version])
if test "$req_libgcrypt_api" -eq "$tmp" ; then
@@ -116,15 +118,15 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
fi
fi
if test $ok = yes; then
- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+ LIBGCRYPT_CFLAGS=`CC=$CC $LIBGCRYPT_CONFIG --cflags`
+ LIBGCRYPT_LIBS=`CC=$CC $LIBGCRYPT_CONFIG --libs`
ifelse([$2], , :, [$2])
- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+ libgcrypt_config_host=`CC=$CC $LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
if test x"$libgcrypt_config_host" != xnone ; then
if test x"$libgcrypt_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
-*** The config script $LIBGCRYPT_CONFIG was
+*** The config script "$LIBGCRYPT_CONFIG" was
*** built for $libgcrypt_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-libgcrypt-prefix
commit 97194b422bc89a6137f4e218d4cdee118c63e96e
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 14:57:53 2018 +0900
build: Provide libgcrypt.pc, generated by configure.
* configure.ac: Generate src/libgcrypt.pc.
* src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New.
(EXTRA_DIST): Add libgcrypt.pc.in.
* src/libgcrypt-config.in: Use @PACKAGE_VERSION at .
* src/libgcrypt.pc.in: New.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/configure.ac b/configure.ac
index 7658f6c..cdce339 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2670,6 +2670,7 @@ doc/Makefile
src/Makefile
src/gcrypt.h
src/libgcrypt-config
+src/libgcrypt.pc
src/versioninfo.rc
tests/Makefile
])
diff --git a/src/Makefile.am b/src/Makefile.am
index 3cc4a55..82d6e8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,8 +20,11 @@
## Process this file with automake to produce Makefile.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgcrypt.pc
+
EXTRA_DIST = libgcrypt-config.in libgcrypt.m4 libgcrypt.vers \
- gcrypt.h.in libgcrypt.def
+ gcrypt.h.in libgcrypt.def libgcrypt.pc.in
bin_SCRIPTS = libgcrypt-config
m4datadir = $(datadir)/aclocal
diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in
index c052638..f7a13af 100644
--- a/src/libgcrypt-config.in
+++ b/src/libgcrypt-config.in
@@ -14,7 +14,7 @@
# General.
prefix="@prefix@"
exec_prefix="@exec_prefix@"
-version="@VERSION@"
+version="@PACKAGE_VERSION@"
includedir="@includedir@"
libdir="@libdir@"
gpg_error_libs="@GPG_ERROR_LIBS@"
diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in
new file mode 100644
index 0000000..5472da5
--- /dev/null
+++ b/src/libgcrypt.pc.in
@@ -0,0 +1,17 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+host=@LIBGCRYPT_CONFIG_HOST@
+api_version=@LIBGCRYPT_CONFIG_API_VERSION@
+symmetric_ciphers="@LIBGCRYPT_CIPHERS@"
+asymmetric_ciphers="@LIBGCRYPT_PUBKEY_CIPHERS@"
+digests="@LIBGCRYPT_DIGESTS@"
+
+Name: libgcrypt
+Description: General purpose cryptographic library
+Requires: gpg-error
+Version: @PACKAGE_VERSION@
+Cflags: @LIBGCRYPT_CONFIG_CFLAGS@
+Libs: @LIBGCRYPT_CONFIG_LIB@
+URL: https://www.gnupg.org/software/libgcrypt/index.html
commit 5b1febb5e40d92072bef425bd9e63f7a07edd57e
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 14:33:23 2018 +0900
build: Update gpg-error.m4 from libgpg-error.
* m4/gpg-error.m4: Update from libgpg-error 1.33.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 1661204..9f26fa4 100644
--- a/m4/gpg-error.m4
+++ b/m4/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,13 +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 --mt --cflags 2>/dev/null`
- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 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=`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 --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([[
@@ -100,7 +102,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
*** The config script $GPG_ERROR_CONFIG was
*** built for $gpg_error_config_host and thus may not match the
*** used host $host.
-*** You may want to use the configure option --with-gpg-error-prefix
+*** You may want to use the configure option --with-libgpg-error-prefix
*** to specify a matching config script or use \$SYSROOT.
***]])
gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
commit 0f4545b441b6fbdd6e9c4e95f5f2a367483e78ad
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 14:29:45 2018 +0900
build: Don't default to underscore=yes for cross-build.
* acinclude.m4: Don't set ac_cv_sys_symbol_underscore
for cross build.
--
It made sense in the past when cross compile were basically for a.out
system, but nowadays, it's better not to assume that.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/acinclude.m4 b/acinclude.m4
index fc208c5..6f7789d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -111,14 +111,10 @@ case "${host}" in
ac_cv_sys_symbol_underscore=yes
;;
*)
- if test "$cross_compiling" = yes; then
- if test "x$ac_cv_sys_symbol_underscore" = x ; then
- ac_cv_sys_symbol_underscore=yes
- fi
- else
+ if test "$cross_compiling" != yes; then
tmp_do_check="yes"
fi
- ;;
+ ;;
esac
if test "$tmp_do_check" = "yes"; then
AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
-----------------------------------------------------------------------
Summary of changes:
acinclude.m4 | 8 ++------
configure.ac | 1 +
m4/gpg-error.m4 | 16 +++++++++-------
src/Makefile.am | 5 ++++-
src/libgcrypt-config.in | 16 ++++++++++++++--
src/libgcrypt.m4 | 20 +++++++++++---------
src/libgcrypt.pc.in | 17 +++++++++++++++++
7 files changed, 58 insertions(+), 25 deletions(-)
create mode 100644 src/libgcrypt.pc.in
hooks/post-receive
--
The GNU crypto library
http://git.gnupg.org
_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits
More information about the Gcrypt-devel
mailing list