pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/converters/libiconv Don't try to link to -liconv in th...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1203ef7ebdcf
branches:  trunk
changeset: 461441:1203ef7ebdcf
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Sep 16 13:57:18 2003 +0000

description:
Don't try to link to -liconv in the install process, it fixes build in
FreeBSD. Closes my own PR pkg/22346.

diffstat:

 converters/libiconv/distinfo         |   3 ++-
 converters/libiconv/patches/patch-aa |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r c1eefd2a66ae -r 1203ef7ebdcf converters/libiconv/distinfo
--- a/converters/libiconv/distinfo      Tue Sep 16 13:53:18 2003 +0000
+++ b/converters/libiconv/distinfo      Tue Sep 16 13:57:18 2003 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2003/09/12 13:52:02 seb Exp $
+$NetBSD: distinfo,v 1.14 2003/09/16 13:57:18 xtraeme Exp $
 
 SHA1 (libiconv-1.9.1.tar.gz) = f130c93fdf20903ca21bace8b8822f46468c9d65
 Size (libiconv-1.9.1.tar.gz) = 3907735 bytes
+SHA1 (patch-aa) = c7b0a6c8d95df305a348d45394a87bc2432683ef
 SHA1 (patch-ab) = bfceb0cde182022bdcf181d3214f88ff27acc4b3
 SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
 SHA1 (patch-ad) = 3e256af27c28b37160a3788c096497241f62d783
diff -r c1eefd2a66ae -r 1203ef7ebdcf converters/libiconv/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/libiconv/patches/patch-aa      Tue Sep 16 13:57:18 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.6 2003/09/16 13:57:19 xtraeme Exp $
+
+--- src/Makefile.in.orig       2003-09-16 15:51:43.000000000 +0200
++++ src/Makefile.in    2003-09-16 15:52:08.000000000 +0200
+@@ -87,7 +87,7 @@
+       if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi
+       if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+       case "@host_os@" in \
+-        hpux* | freebsd*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
++        hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
+         *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
+       esac
+       $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv



Home | Main Index | Thread Index | Old Index