[git] GPG-ERROR - branch, master, updated. libgpg-error-1.32-11-g144f4b3

[by NIIBE Yutaka]

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  144f4b3df5200ce056f00e20420cde77eb1f673d (commit)
       via  5564efac95e9546af948fc13c90584264b322950 (commit)
      from  48c8f8ddfc80551db7615e1eb3555c1dc3f6a657 (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 144f4b3df5200ce056f00e20420cde77eb1f673d
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Sep 19 11:14:02 2018 +0900

    src: Fix Makefile for BSD make.
    
    * src/Makefile.am (BUILT_SOURCES): Add srcdir to err-sources.h and
    err-codes.h.
    (CLEANFILES): Move err-sources.h and err-codes.h to...
    (MAINTAINERCLEANFILES): ... this new target.
    (gpg_error_LDADD): Remove ./ to generate libgpg-error.la.
    
    --
    
    BSD make is not kind enough to mix path and target.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/Makefile.am b/src/Makefile.am
index 914768c..925bfdd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,13 +101,14 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
 	gpg-error-config-new.in gpg-error-config-test.sh gpg-error.pc.in \
 	$(lock_obj_pub)
 
-BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
+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
 
 tmp_files = _mkerrcodes.h _gpg-error.def.h mkw32errmap.tab.h mkw32errmap.map.c
 
-CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
+CLEANFILES = code-to-errno.h code-from-errno.h \
 	gpg-error.h gpgrt.h gpgrt-config \
         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 \
@@ -115,6 +116,8 @@ CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
 	gpg-error-config gpg-error-config-test.log \
 	$(tmp_files) lock-obj-pub.native.h
 
+MAINTAINERCLEANFILES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h
+
 TESTS = gpg-error-config-test.sh
 
 #
@@ -215,7 +218,7 @@ libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD)
 gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
 gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
                      -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
-gpg_error_LDADD = ./libgpg-error.la $(LTLIBINTL)
+gpg_error_LDADD = libgpg-error.la $(LTLIBINTL)
 
 # We build err-sources.h and err-codes.h in the source directory.
 # This is needed because gettext does only look into the source

commit 5564efac95e9546af948fc13c90584264b322950
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Sep 19 10:50:12 2018 +0900

    Accept pkgconf difference for spaces.
    
    * src/gpg-error-config-test.sh (OUTPUT_OLD): Use shell
    and echo to remove spaces.
    
    --
    
    There is an alternative implementation of pkg-conf, named pkgconf.
    It emits an extra space at the end.
    
    Tested on FreeBSD 11.1.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/gpg-error-config-test.sh b/src/gpg-error-config-test.sh
index 7f97ead..7ed70df 100755
--- a/src/gpg-error-config-test.sh
+++ b/src/gpg-error-config-test.sh
@@ -29,15 +29,15 @@ failure () {
 
 rm -f gpg-error-config-test.log
 
-OUTPUT_OLD=$($PKG_CONFIG_CMD --libs)
+OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --libs))
 OUTPUT_NEW=$(./gpg-error-config-new --libs)
 [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --libs
 
-OUTPUT_OLD=$($PKG_CONFIG_CMD --cflags)
+OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --cflags))
 OUTPUT_NEW=$(./gpg-error-config-new --cflags)
 [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags
 
-OUTPUT_OLD=$($PKG_CONFIG_CMD --cflags --libs)
+OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --cflags --libs))
 OUTPUT_NEW=$(./gpg-error-config-new --cflags --libs)
 [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags --libs
 

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

Summary of changes:
 src/Makefile.am              | 9 ++++++---
 src/gpg-error-config-test.sh | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org