summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-05-31 09:03:56 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-05-31 09:03:56 +0000
commit4077d6d2c7f955a6ade0b9ccebec317d4ccf102f (patch)
tree63e49c0db67dd1635e0961d6ec4b81cc342e2442 /rules
parent4fbbd7cf02a1bd3471c4796b67eccc14fd83e00a (diff)
downloadptxdist-4077d6d2c7f955a6ade0b9ccebec317d4ccf102f.tar.gz
ptxdist-4077d6d2c7f955a6ade0b9ccebec317d4ccf102f.tar.xz
[libiconv] version bump to 1.13
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10622 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
-rw-r--r--rules/libiconv.in2
-rw-r--r--rules/libiconv.make11
2 files changed, 6 insertions, 7 deletions
diff --git a/rules/libiconv.in b/rules/libiconv.in
index b99ca5d32..e472841f0 100644
--- a/rules/libiconv.in
+++ b/rules/libiconv.in
@@ -1,9 +1,9 @@
## SECTION=system_libraries
+
menuconfig LIBICONV
tristate
prompt "libiconv "
help
-
libiconv converts traditional character encodings
to/from UNICODE. It is for you if your application
needs to support multiple character encodings, but
diff --git a/rules/libiconv.make b/rules/libiconv.make
index 30d25c1e2..271f80106 100644
--- a/rules/libiconv.make
+++ b/rules/libiconv.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_LIBICONV) += libiconv
#
# Paths and names
#
-LIBICONV_VERSION := 1.12
+LIBICONV_VERSION := 1.13
LIBICONV := libiconv-$(LIBICONV_VERSION)
LIBICONV_SUFFIX := tar.gz
LIBICONV_URL := $(PTXCONF_SETUP_GNUMIRROR)/libiconv/$(LIBICONV).$(LIBICONV_SUFFIX)
@@ -66,12 +66,11 @@ $(STATEDIR)/libiconv.targetinstall:
@$(call install_fixup,libiconv,DEPENDS,)
@$(call install_fixup,libiconv,DESCRIPTION,missing)
- @$(call install_copy, libiconv, 0, 0, 0644, \
- $(LIBICONV_DIR)/lib/.libs/libiconv.so.2.4.0, \
- /usr/lib/libiconv.so.2.4.0)
+ @$(call install_copy, libiconv, 0, 0, 0644, -, \
+ /usr/lib/libiconv.so.2.5.0)
- @$(call install_link, libiconv, libiconv.so.2.4.0, /usr/lib/libiconv.so.2)
- @$(call install_link, libiconv, libiconv.so.2.4.0, /usr/lib/libiconv.so)
+ @$(call install_link, libiconv, libiconv.so.2.5.0, /usr/lib/libiconv.so.2)
+ @$(call install_link, libiconv, libiconv.so.2.5.0, /usr/lib/libiconv.so)
@$(call install_finish,libiconv)