diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-06-09 23:11:42 +0000 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-06-09 23:11:42 +0000 |
commit | e7e42350a5f83f426ca3986a9ec90fb2ce796ea8 (patch) | |
tree | 41b65e9a29ebea8af2485ee25588b9c2539b6da8 /rules/gnupg.make | |
parent | 7595a886825031bc18750e9f3bcda9138164c361 (diff) | |
download | ptxdist-e7e42350a5f83f426ca3986a9ec90fb2ce796ea8.tar.gz ptxdist-e7e42350a5f83f426ca3986a9ec90fb2ce796ea8.tar.xz |
iconv: rework iconv handling in ptxdist
libiconv provides functionality that is already provided by glibc. So we
consolidate ptxdist to use native glibc iconv instead of libiconv
support.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10681 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/gnupg.make')
-rw-r--r-- | rules/gnupg.make | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/rules/gnupg.make b/rules/gnupg.make index 90f84e9b1..a6287d495 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -67,7 +67,6 @@ GNUPG_ENV = $(CROSS_ENV) GNUPG_AUTOCONF = $(CROSS_AUTOCONF_USR) \ --disable-asm \ --disable-card-support \ - --disable-gnupg-iconv \ --disable-exec \ --disable-idea \ --enable-cast5 \ @@ -91,6 +90,12 @@ GNUPG_AUTOCONF = $(CROSS_AUTOCONF_USR) \ --disable-rpath \ --disable-regex +ifdef PTXCONF_ICONV +GNUPG_AUTOCONF += --enable-gnupg-iconv +else +GNUPG_AUTOCONF += --disable-gnupg-iconv +endif + $(STATEDIR)/gnupg.prepare: $(gnupg_prepare_deps_default) @$(call targetinfo, $@) @$(call clean, $(GNUPG_DIR)/config.cache) |