summaryrefslogtreecommitdiffstats
path: root/patches/libiconv-1.13/fix-host-iconv-leak.diff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/libiconv-1.13/fix-host-iconv-leak.diff')
-rw-r--r--patches/libiconv-1.13/fix-host-iconv-leak.diff18
1 files changed, 18 insertions, 0 deletions
diff --git a/patches/libiconv-1.13/fix-host-iconv-leak.diff b/patches/libiconv-1.13/fix-host-iconv-leak.diff
new file mode 100644
index 000000000..48f02c6f8
--- /dev/null
+++ b/patches/libiconv-1.13/fix-host-iconv-leak.diff
@@ -0,0 +1,18 @@
+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>
+
+Index: libiconv-1.13/src/Makefile.in
+===================================================================
+--- libiconv-1.13.orig/src/Makefile.in
++++ libiconv-1.13/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;; \
+- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
+ esac
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
+