diff options
| author | Andreas Pretzsch <apr@cn-eng.de> | 2015-03-17 22:02:36 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-03-18 15:47:29 +0100 |
| commit | 570816bd4f455c42c1bb41e01d874478ea761841 (patch) | |
| tree | 2d3bb8d39fa8b15f8655f82023ff0effae2de18b /rules/gnupg.make | |
| parent | 3872cfcce083b74f25b0c6fe8c56950a1cad9056 (diff) | |
| download | ptxdist-570816bd4f455c42c1bb41e01d874478ea761841.tar.gz ptxdist-570816bd4f455c42c1bb41e01d874478ea761841.tar.xz | |
gnupg: fix build breakage if ICONV is not enabled
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>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/gnupg.make')
| -rw-r--r-- | rules/gnupg.make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/gnupg.make b/rules/gnupg.make index 71e765e18..67d671943 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 # ---------------------------------------------------------------------------- |