From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.mars-solutions.de ([213.239.212.107]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YXydO-0003Bb-ON for ptxdist@pengutronix.de; Tue, 17 Mar 2015 22:02:43 +0100 Received: from localhost (localhost [127.0.0.1]) by mail.mars-solutions.de (Postfix) with ESMTP id 06C224F434C6 for ; Tue, 17 Mar 2015 22:02:37 +0100 (CET) Received: from mail.mars-solutions.de ([127.0.0.1]) by localhost (mars-solutions.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rv1xbDzgSf1e for ; Tue, 17 Mar 2015 22:02:36 +0100 (CET) Received: from ws-apr.office.loc (HSI-KBW-37-49-66-254.hsi14.kabel-badenwuerttemberg.de [37.49.66.254]) by mail.mars-solutions.de (Postfix) with ESMTP id DAA764F434C6 for ; Tue, 17 Mar 2015 22:02:36 +0100 (CET) From: Andreas Pretzsch Date: Tue, 17 Mar 2015 22:02:36 +0100 Message-Id: <1426626156-24206-1-git-send-email-apr@cn-eng.de> Subject: [ptxdist] [PATCH] gnupg: fix build breakage if ICONV is not enabled Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de 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: _AUTOCONF is incompatible with _CONF_OPT Fix this by adding it to GNUPG_CONF_OPT instead. Signed-off-by: Andreas Pretzsch --- 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