diff options
Diffstat (limited to 'converters/libiconv/patches/patch-af')
| -rw-r--r-- | converters/libiconv/patches/patch-af | 53 |
1 files changed, 4 insertions, 49 deletions
diff --git a/converters/libiconv/patches/patch-af b/converters/libiconv/patches/patch-af index 3a7b7f3a25a..77388530a2f 100644 --- a/converters/libiconv/patches/patch-af +++ b/converters/libiconv/patches/patch-af @@ -1,53 +1,8 @@ -$NetBSD: patch-af,v 1.5 2010/01/06 21:01:09 tron Exp $ +$NetBSD: patch-af,v 1.6 2010/11/10 21:00:50 adam Exp $ ---- lib/Makefile.in.orig 2007-05-27 23:15:31.000000000 +0100 -+++ lib/Makefile.in 2010-01-06 20:53:18.000000000 +0000 -@@ -69,35 +69,15 @@ - libiconv.la : $(OBJECTS) - $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) - --preloadable_libiconv.so : preloadable_libiconv_@OS@.so -- $(RM) preloadable_libiconv.so -- $(LN_S) preloadable_libiconv_@OS@.so preloadable_libiconv.so -- --preloadable_libiconv_linux.so : $(SOURCES) -- if test -n "@GCC@"; then \ -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \ -- else \ -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \ -- fi -- --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; \ -- else \ -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -G -o preloadable_libiconv_solaris.so; \ -- fi -- --preloadable_libiconv_osf.so : $(SOURCES) -- if test -n "@GCC@"; then \ -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_osf.so; \ -- else \ -- mkdir objects; \ -- for f in $(SOURCES); do \ -- $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DPIC -DLIBICONV_PLUG -c $$f -o objects/`basename $$f | sed -e 's,\.c$$,.o,'`; \ -- done; \ -- /bin/ld -shared -expect_unresolved \* -o preloadable_libiconv_osf.so objects/*.o; \ -- rm -rf objects; \ -- fi -+preloadable_libiconv.so : $(SOURCES) -+ $(RM) -rf objects -+ mkdir objects && \ -+ for f in $(SOURCES); do \ -+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DLIBICONV_PLUG -c $$f -o objects/`basename $$f | sed -e 's,\.c$$,.o,'` || exit 1; \ -+ done && \ -+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o objects/libiconv.la -rpath $(libdir) -no-undefined objects/*.lo && \ -+ cp objects/.libs/libiconv.so preloadable_libiconv.so -+ $(RM) -rf objects - - iconv.lo : $(srcdir)/iconv.c $(srcdir)/converters.h $(srcdir)/encodings.def $(srcdir)/encodings_aix.def $(srcdir)/encodings_osf1.def $(srcdir)/encodings_dos.def $(srcdir)/encodings_local.def $(srcdir)/aliases.h $(srcdir)/aliases_aix.h $(srcdir)/aliases_osf1.h $(srcdir)/aliases_dos.h $(srcdir)/flags.h - $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c $(srcdir)/iconv.c -@@ -118,14 +98,14 @@ +--- 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 |