[pkgsrc/trunk]: pkgsrc/converters/libiconv Fix the part of the makefile that ...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c9b001f042c1
branches:  trunk
changeset: 569087:c9b001f042c1
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jan 06 18:53:05 2010 +0000

description:
Fix the part of the makefile that builds "preloadable_libiconv.so" under
Solaris if GCC is used. As this bit is both operating system and compiler
specific we can simple bypass "libtool" which is what must have happened
with the old "libtool".

The build in the non-GCC case or under Linux respectively OSF1 might
still be broken. But I don't have a setup to test that.

diffstat:

 converters/libiconv/distinfo         |   4 ++--
 converters/libiconv/patches/patch-af |  18 ++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r d4cc46ea3825 -r c9b001f042c1 converters/libiconv/distinfo
--- a/converters/libiconv/distinfo      Wed Jan 06 18:42:25 2010 +0000
+++ b/converters/libiconv/distinfo      Wed Jan 06 18:53:05 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2008/01/13 09:31:11 joerg Exp $
+$NetBSD: distinfo,v 1.31 2010/01/06 18:53:05 tron Exp $
 
 SHA1 (libiconv-1.12-cp932.patch.gz) = 7c433e19a61a15bd9585e01c0a6fbe2eb9129625
 RMD160 (libiconv-1.12-cp932.patch.gz) = 33eb9758470f5e7ca0608fc478ea1342bf6bd0dc
@@ -11,4 +11,4 @@
 SHA1 (patch-ac) = a27e8ab5a776a2bc8b2c790eabff5c15985d9584
 SHA1 (patch-ad) = e94da1c4423677b74f463d4b132c7714efc65815
 SHA1 (patch-ae) = e18c4d9dd76b27e40c8dcd273f856fe5933f72bc
-SHA1 (patch-af) = de976e1f97fa5f8b973be1a225ae3e0ee2352851
+SHA1 (patch-af) = 08d1cc207ab246674e7f39064826d9cc5c08d760
diff -r d4cc46ea3825 -r c9b001f042c1 converters/libiconv/patches/patch-af
--- a/converters/libiconv/patches/patch-af      Wed Jan 06 18:42:25 2010 +0000
+++ b/converters/libiconv/patches/patch-af      Wed Jan 06 18:53:05 2010 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-af,v 1.3 2007/11/29 17:05:35 wiz Exp $
+$NetBSD: patch-af,v 1.4 2010/01/06 18:53:05 tron Exp $
 
---- lib/Makefile.in.orig       2007-05-27 22:15:31.000000000 +0000
-+++ lib/Makefile.in
-@@ -118,14 +118,14 @@ libiconv.res : $(srcdir)/../windows/libi
+--- lib/Makefile.in.orig       Mon May 28 00:15:31 2007
++++ lib/Makefile.in    Wed Jan  6 19:44:49 2010
+@@ -82,7 +82,7 @@
+ 
+ preloadable_libiconv_solaris.so : $(SOURCES)
+       if test -n "@GCC@"; then \
+-        $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_solaris.so; \
++        $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_solaris.so; \
+       else \
+         $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -G -o preloadable_libiconv_solaris.so; \
+       fi
+@@ -118,7 +118,7 @@
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
        if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi
@@ -11,6 +20,7 @@
  
  # On AIX, libiconv.a must include the object files of /lib/libiconv.a,
  # otherwise the setlocale() call fails when invoked from executables linked
+@@ -125,7 +125,7 @@
  # with -rpath $(libdir), even if linked without -liconv.
  install : all force
        if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi