summaryrefslogtreecommitdiffstats
path: root/patches/libiconv-1.13.1
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-07-06 07:07:45 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-07-06 07:07:45 +0000
commita9eb849237968695bc4f9af2e0e216ac42de501e (patch)
treee26705e89a4c430a3b978bacae84f784211485ec /patches/libiconv-1.13.1
parent30d8ed5128e8e2890caff11c5465a9658ca0d830 (diff)
downloadptxdist-a9eb849237968695bc4f9af2e0e216ac42de501e.tar.gz
ptxdist-a9eb849237968695bc4f9af2e0e216ac42de501e.tar.xz
[host-libiconv] version bump to 1.13.1
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10941 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/libiconv-1.13.1')
-rw-r--r--patches/libiconv-1.13.1/fix-host-iconv-leak.diff22
-rw-r--r--patches/libiconv-1.13.1/series1
2 files changed, 23 insertions, 0 deletions
diff --git a/patches/libiconv-1.13.1/fix-host-iconv-leak.diff b/patches/libiconv-1.13.1/fix-host-iconv-leak.diff
new file mode 100644
index 000000000..b892846f1
--- /dev/null
+++ b/patches/libiconv-1.13.1/fix-host-iconv-leak.diff
@@ -0,0 +1,22 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Subject: don't let host's libiconv leak into during install process
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libiconv-1.13.1/src/Makefile.in
+===================================================================
+--- libiconv-1.13.1.orig/src/Makefile.in
++++ libiconv-1.13.1/src/Makefile.in
+@@ -113,7 +113,7 @@ install : all force
+ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ case "@host_os@" in \
+ hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
+- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ esac
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
+
diff --git a/patches/libiconv-1.13.1/series b/patches/libiconv-1.13.1/series
new file mode 100644
index 000000000..e94fe6b8d
--- /dev/null
+++ b/patches/libiconv-1.13.1/series
@@ -0,0 +1 @@
+fix-host-iconv-leak.diff