From: Andreas Pretzsch <apr@cn-eng.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] gnupg: fix build breakage if ICONV is not enabled
Date: Tue, 17 Mar 2015 22:02:36 +0100 [thread overview]
Message-ID: <1426626156-24206-1-git-send-email-apr@cn-eng.de> (raw)
If PTXCONF_ICONV is not enabled, --without-libiconv-prefix is
passed as configure option.
Currently, this is done by adding the option to GNUPG_AUTOCONF,
which causes ptxdist to abort with
ptxdist: error: ptxd_make_world_init_compat: <PKG>_AUTOCONF
is incompatible with <PKG>_CONF_OPT
Fix this by adding it to GNUPG_CONF_OPT instead.
Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
---
Attn.: Tested only with ptxdist-2014.05, but as the same logic
applies in latest ptxdist, this should still work.
rules/gnupg.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 71e765e..67d6719 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -54,7 +54,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--disable-bzip2
ifndef PTXCONF_ICONV
-GNUPG_AUTOCONF += --without-libiconv-prefix
+GNUPG_CONF_OPT += --without-libiconv-prefix
endif
# ----------------------------------------------------------------------------
--
2.1.3
--
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2015-03-17 21:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-17 21:02 Andreas Pretzsch [this message]
2015-03-26 8:47 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426626156-24206-1-git-send-email-apr@cn-eng.de \
--to=apr@cn-eng.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox