diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2003-09-16 13:57:18 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2003-09-16 13:57:18 +0000 |
| commit | b8947ef00dcc25518ffb674b3490d0f09cc06c26 (patch) | |
| tree | eb1183619407fd19228d88bb5b22be652ee28b8c /converters/libiconv | |
| parent | d294d693188c961952009879442decd8dc96279c (diff) | |
| download | pkgsrc-b8947ef00dcc25518ffb674b3490d0f09cc06c26.tar.gz | |
Don't try to link to -liconv in the install process, it fixes build in
FreeBSD. Closes my own PR pkg/22346.
Diffstat (limited to 'converters/libiconv')
| -rw-r--r-- | converters/libiconv/distinfo | 3 | ||||
| -rw-r--r-- | converters/libiconv/patches/patch-aa | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index 585a37ff971..24d9b7a965b 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -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 --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa new file mode 100644 index 00000000000..7d87863dee2 --- /dev/null +++ b/converters/libiconv/patches/patch-aa @@ -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 |