19 lines
1.3 KiB
Diff
19 lines
1.3 KiB
Diff
diff -Paur --no-dereference -- libiconv.upstream/src/Makefile.in libiconv/src/Makefile.in
|
|
--- libiconv.upstream/src/Makefile.in
|
|
+++ libiconv/src/Makefile.in
|
|
@@ -109,11 +109,13 @@
|
|
# refers to a libiconv.so in $prefix/lib since then it sees two libiconv.so's,
|
|
# one in $prefix/lib and one in ../lib/.libs. So we have to avoid using
|
|
# ../lib/libiconv.la entirely.
|
|
+# PATCH: Linking with the installed .la file isn't cross-compilation safe as it
|
|
+# doesn't know about the sysroot and DESTDIR.
|
|
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)
|
|
|