[git] GPG-ERROR - branch, master, updated. libgpg-error-1.32-39-gffbff04
by NIIBE Yutaka
cvs at cvs.gnupg.org
Thu Oct 25 13:07:15 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 ffbff048bde636e3ec19f2912fa4034e70e18f44 (commit)
via e06af32bdde0b4ce8c97193472961f31c5b55ddf (commit)
from abc641f27cf712dec572b6629552b6a6f0b7af27 (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 ffbff048bde636e3ec19f2912fa4034e70e18f44
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Thu Oct 25 20:02:37 2018 +0900
gpg-error-config: Keep old gpg-error-config implementation.
* configure.ac: Generate gpgrt-config from gpgrt-config.in.
* src/gpgrt-config.in: Rename from src/gpg-error-config-new.in.
* src/Makefile.am (bin_SCRIPTS): Add gpgrt-config.
(EXTRA_DIST): Add gpgrt-config.in removing gpg-error-config-new.in.
(BUILT_SOURCES, CLEANFILES): Remove gpgrt-config.
(gpg-error-config): Always copy from gpg-error-config-old.
* src/gpg-error-config-test.sh: Follow the rename.
--
The gpgrt-config script is new implementation supporting *.pc file,
while gpg-error-config keeps old single shell script.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/configure.ac b/configure.ac
index b735fa6..81b72f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -672,7 +672,7 @@ AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd])
AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest])
AC_CONFIG_FILES([src/gpg-error.pc])
AC_CONFIG_FILES([src/gpg-error-config-old:src/gpg-error-config.in], [chmod +x src/gpg-error-config-old])
-AC_CONFIG_FILES([src/gpg-error-config-new], [chmod +x src/gpg-error-config-new])
+AC_CONFIG_FILES([src/gpgrt-config], [chmod +x src/gpgrt-config])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index d568d73..6df2d6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,8 +84,7 @@ lock_obj_pub = \
lib_LTLIBRARIES = libgpg-error.la
nodist_include_HEADERS = gpg-error.h gpgrt.h
-bin_SCRIPTS = gpg-error-config
-nodist_bin_SCRIPTS = gpgrt-config
+bin_SCRIPTS = gpgrt-config gpg-error-config
m4datadir = $(datadir)/aclocal
m4data_DATA = gpg-error.m4 gpgrt.m4
@@ -99,18 +98,18 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \
gpg-error.vers gpg-error.def.in \
versioninfo.rc.in gpg-error.w32-manifest.in \
- gpg-error-config-new.in gpg-error-config-test.sh gpg-error.pc.in \
+ gpgrt-config.in gpg-error-config-test.sh gpg-error.pc.in \
$(lock_obj_pub)
BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
code-to-errno.h code-from-errno.h \
err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h gpgrt.h \
- gpgrt-config gpg-error.def mkw32errmap.map.c
+ gpg-error.def mkw32errmap.map.c
tmp_files = _mkerrcodes.h _gpg-error.def.h mkw32errmap.tab.h mkw32errmap.map.c
CLEANFILES = code-to-errno.h code-from-errno.h \
- gpg-error.h gpgrt.h gpgrt-config \
+ gpg-error.h gpgrt.h \
mkerrcodes$(EXEEXT_FOR_BUILD) mkerrcodes.h gpg-error.def mkw32errmap.tab.h \
mkw32errmap.map.c err-sources-sym.h err-codes-sym.h errnos-sym.h \
gpg-extra/errno.h mkheader$(EXEEXT_FOR_BUILD) \
@@ -335,19 +334,15 @@ gpg-error.h: Makefile mkheader$(EXEEXT_FOR_BUILD) $(parts_of_gpg_error_h) \
gpgrt.h: gpg-error.h
cp gpg-error.h gpgrt.h
-gpgrt-config: gpg-error-config
- cp gpg-error-config gpgrt-config
-
-gpg-error-config: gpg-error-config-new gpg-error-config-old
+gpg-error-config: gpgrt-config gpg-error-config-old
@echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
@if $(srcdir)/gpg-error-config-test.sh --old-new; then \
echo "good"; \
- cp gpg-error-config-new $@; \
else \
echo "no"; \
echo "*** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
- cp gpg-error-config-old $@; \
fi
+ cp gpg-error-config-old $@
install-data-local:
if HAVE_W32CE_SYSTEM
diff --git a/src/gpg-error-config-test.sh b/src/gpg-error-config-test.sh
index 527e118..2d8b94b 100755
--- a/src/gpg-error-config-test.sh
+++ b/src/gpg-error-config-test.sh
@@ -22,7 +22,7 @@ failure () {
echo "Test result: $*"
echo "====================: $PKG_CONFIG_CMD"
echo "$OUTPUT_OLD"
- echo "====================: gpg-error-config-new"
+ echo "====================: gpgrt-config"
echo "$OUTPUT_NEW"
echo "===================="
) >> gpg-error-config-test.log
@@ -32,54 +32,54 @@ failure () {
rm -f gpg-error-config-test.log
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --libs))
-OUTPUT_NEW=$(./gpg-error-config-new --libs)
+OUTPUT_NEW=$(./gpgrt-config --libs)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --libs
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --cflags))
-OUTPUT_NEW=$(./gpg-error-config-new --cflags)
+OUTPUT_NEW=$(./gpgrt-config --cflags)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --cflags --libs))
-OUTPUT_NEW=$(./gpg-error-config-new --cflags --libs)
+OUTPUT_NEW=$(./gpgrt-config --cflags --libs)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags --libs
if [ "$PKG_CONFIG_CMD" = ./gpg-error-config-old ]; then
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --version))
- OUTPUT_NEW=$(./gpg-error-config-new --version)
+ OUTPUT_NEW=$(./gpgrt-config --version)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --version
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --mt --libs))
- OUTPUT_NEW=$(./gpg-error-config-new --mt --libs)
+ OUTPUT_NEW=$(./gpgrt-config --mt --libs)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --mt --libs
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --mt --cflags))
- OUTPUT_NEW=$(./gpg-error-config-new --mt --cflags)
+ OUTPUT_NEW=$(./gpgrt-config --mt --cflags)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --mt --cflags
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --cflags --libs))
- OUTPUT_NEW=$(./gpg-error-config-new --cflags --libs)
+ OUTPUT_NEW=$(./gpgrt-config --cflags --libs)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags --libs
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --mt --cflags --libs))
- OUTPUT_NEW=$(./gpg-error-config-new --mt --cflags --libs)
+ OUTPUT_NEW=$(./gpgrt-config --mt --cflags --libs)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --mt --cflags --libs
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --variable=mtcflags))
- OUTPUT_NEW=$(./gpg-error-config-new --variable=mtcflags)
+ OUTPUT_NEW=$(./gpgrt-config --variable=mtcflags)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --variable=mtcflags
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --variable=mtlibs))
- OUTPUT_NEW=$(./gpg-error-config-new --variable=mtlibs)
+ OUTPUT_NEW=$(./gpgrt-config --variable=mtlibs)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --variable=mtlibs
OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --variable=host))
- OUTPUT_NEW=$(./gpg-error-config-new --variable=host)
+ OUTPUT_NEW=$(./gpgrt-config --variable=host)
[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --variable=host
fi
if [ -n "$test_failed" ]; then
OUTPUT_OLD=$($PKG_CONFIG_CMD --version)
- OUTPUT_NEW=$(./gpg-error-config-new --version)
+ OUTPUT_NEW=$(./gpgrt-config --version)
failure --version
exit 99
diff --git a/src/gpg-error-config-new.in b/src/gpgrt-config.in
similarity index 100%
rename from src/gpg-error-config-new.in
rename to src/gpgrt-config.in
commit e06af32bdde0b4ce8c97193472961f31c5b55ddf
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Thu Oct 25 19:32:17 2018 +0900
build: Set GPGRT_CONFIG in gpg-error.m4.
* src/gpg-error.m4: Detect gpgrt-config to set GPGRT_CONFIG.
--
Set GPGRT_CONFIG when there is no gpg-error-config or gpg-error-config
reports version >= 1.33.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index 0f46cd6..f89a4ee 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
@@ -62,15 +62,21 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
min_gpg_error_version=ifelse([$1], ,1.33,$1)
- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
ok=no
- if test "$GPG_ERROR_CONFIG" != "no" \
- && test -f "$GPG_ERROR_CONFIG" ; then
+ if test "$GPG_ERROR_CONFIG" = "no"; then
+ AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
+ if CC=$CC $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
+ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+ gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --modversion`
+ fi
+ else
+ gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --version`
+ fi
+ if test "$GPG_ERROR_CONFIG" != "no"; then
req_major=`echo $min_gpg_error_version | \
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=`CC=$CC $GPG_ERROR_CONFIG --version`
major=`echo $gpg_error_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $gpg_error_config_version | \
@@ -84,7 +90,14 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
fi
fi
+ if test -z "$GPGRT_CONFIG"; then
+ if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
+ AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
+ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+ fi
+ fi
fi
+ AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
if test $ok = yes; then
GPG_ERROR_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG --cflags`
GPG_ERROR_LIBS=`CC=$CC $GPG_ERROR_CONFIG --libs`
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
src/Makefile.am | 17 ++++++----------
src/gpg-error-config-test.sh | 26 ++++++++++++------------
src/gpg-error.m4 | 21 +++++++++++++++----
src/{gpg-error-config-new.in => gpgrt-config.in} | 0
5 files changed, 37 insertions(+), 29 deletions(-)
rename src/{gpg-error-config-new.in => gpgrt-config.in} (100%)
hooks/post-receive
--
Error codes used by GnuPG et al.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list