diff options
Diffstat (limited to 'converters/libiconv/patches/patch-af')
| -rw-r--r-- | converters/libiconv/patches/patch-af | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/converters/libiconv/patches/patch-af b/converters/libiconv/patches/patch-af index 7c4fe08eb4d..8d037717c1c 100644 --- a/converters/libiconv/patches/patch-af +++ b/converters/libiconv/patches/patch-af @@ -1,20 +1,21 @@ -$NetBSD: patch-af,v 1.2 2007/03/20 00:44:53 wiz Exp $ +$NetBSD: patch-af,v 1.3 2007/11/29 17:05:35 wiz Exp $ ---- lib/Makefile.in.orig 2006-07-14 13:18:42.000000000 +0000 +--- lib/Makefile.in.orig 2007-05-27 22:15:31.000000000 +0000 +++ lib/Makefile.in -@@ -110,13 +110,13 @@ iconv-exports.lo : $(srcdir)/../woe32dll +@@ -118,14 +118,14 @@ libiconv.res : $(srcdir)/../windows/libi # $(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)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi - if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi 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 - if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi - - installdirs : force + case "@host_os@" in \ + aix*) (cd $(DESTDIR)$(libdir) && \ + objects=`ar t libiconv.a`" "`ar t /lib/libiconv.a` && \ |