[Pkg-gnupg-commit] [libgpg-error] 02/14: use compiler flags for yat2m

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository libgpg-error.

commit b1b15de0e012a7a437e6726b88138a1c4fbfd5a2
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Feb 5 18:11:53 2018 -0500

    use compiler flags for yat2m
---
 .../0016-use-compiler-flags-for-yat2m.patch        | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/0016-use-compiler-flags-for-yat2m.patch b/debian/patches/0016-use-compiler-flags-for-yat2m.patch
new file mode 100644
index 0000000..2758ebc
--- /dev/null
+++ b/debian/patches/0016-use-compiler-flags-for-yat2m.patch
@@ -0,0 +1,28 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Mon, 5 Feb 2018 18:11:34 -0500
+Subject: use compiler flags for yat2m
+
+Note that we leave the flags alone when cross-compiling, since yat2m
+isn't intended to be installed in that case.
+---
+ doc/Makefile.am | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d052283..b82d7bf 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -35,8 +35,13 @@ myman_pages   = gpg-error-config.1
+ man_MANS = $(myman_pages)
+ 
+ yat2m: yat2m.c
++if CROSS_COMPILING
+ 	$(CC_FOR_BUILD) -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+                 -o $@ $(srcdir)/yat2m.c
++else
++	$(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
++                -o $@ $(srcdir)/yat2m.c
++endif
+ 
+ 
+ yat2m-stamp: $(myman_sources)
diff --git a/debian/patches/series b/debian/patches/series
index 304c652..9d0097a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 0013-yat2m-Use-version-from-libgpg-error.patch
 0014-yat2m-Change-bug-report-address.patch
 0015-build-Install-yat2m.patch
+0016-use-compiler-flags-for-yat2m.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libgpg-error.git