diff options
| author | tron <tron> | 2010-01-06 18:53:05 +0000 |
|---|---|---|
| committer | tron <tron> | 2010-01-06 18:53:05 +0000 |
| commit | b326e54d4e9caf4a0a6a79ca458a1cf66f8d7f2c (patch) | |
| tree | 650c8385eccf02b2c029b6eb0963264a4d284bfa /converters/libiconv/patches/patch-af | |
| parent | ed0636900508aef1a5a8b14c8cabb006b7d9ffb3 (diff) | |
| download | pkgsrc-b326e54d4e9caf4a0a6a79ca458a1cf66f8d7f2c.tar.gz | |
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 (limited to 'converters/libiconv/patches/patch-af')
| -rw-r--r-- | converters/libiconv/patches/patch-af | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/converters/libiconv/patches/patch-af b/converters/libiconv/patches/patch-af index 8d037717c1c..8600f32f94a 100644 --- a/converters/libiconv/patches/patch-af +++ b/converters/libiconv/patches/patch-af @@ -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 @@ $NetBSD: patch-af,v 1.3 2007/11/29 17:05:35 wiz Exp $ # 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 |