d434111da0
In the Makefile.in, libcharset is copied with pax into lib/ along with its object files. This overwrites relocatable.lo from libiconv, which is then relinked against the wrong object. Use "libtool --mode=install cp" instead to only copy the library. Should hopefully fix PR pkg/45341.
21 lines
1.1 KiB
Text
21 lines
1.1 KiB
Text
$NetBSD: patch-af,v 1.8 2011/09/08 16:29:49 bsiegert Exp $
|
|
|
|
--- lib/Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000
|
|
+++ lib/Makefile.in
|
|
@@ -96,14 +96,14 @@ libiconv.res.lo : $(srcdir)/../windows/l
|
|
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
|
|
install-lib : all force
|
|
if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi
|
|
- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la
|
|
+ $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(libdir)/libiconv.la
|
|
|
|
# On AIX, libiconv.a must include the object files of /lib/libiconv.a,
|
|
# otherwise the setlocale() call fails when invoked from executables linked
|
|
# with -rpath $(libdir), even if linked without -liconv.
|
|
install : all force
|
|
if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi
|
|
- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
|
|
+ $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
|
|
case "@host_os@" in \
|
|
aix*) (cd $(DESTDIR)$(libdir) && \
|
|
objects=`ar t libiconv.a`" "`ar t /lib/libiconv.a` && \
|