[pkgsrc/trunk]: pkgsrc/bootstrap tnftp means to link with its own libedit, bu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ff6e07c0192
branches:  trunk
changeset: 529020:7ff6e07c0192
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed May 23 04:20:36 2007 +0000

description:
tnftp means to link with its own libedit, but on OS X the linker's
search order means that the system libedit gets found first. This
hasn't been much of a problem until now, but the system libedit
lacks support for Apple's 64-bit architectures, which breaks the
Universal build. Therefore, force linking with tnftp's internal
libedit by replacing "-ledit" in ${LIBS} with "../libedit/libedit.a".
Workaround suggested by tls.

diffstat:

 bootstrap/bootstrap |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 1ec8f20334c9 -r 7ff6e07c0192 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Wed May 23 02:31:48 2007 +0000
+++ b/bootstrap/bootstrap       Wed May 23 04:20:36 2007 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.96 2007/04/25 13:24:24 tnn Exp $
+# $NetBSD: bootstrap,v 1.97 2007/05/23 04:20:36 schmonz Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -818,7 +818,7 @@
        esac
        echo_msg "Installing tnftp"
        copy_src $pkgsrcdir/net/tnftp/files tnftp
-       run_cmd "(cd $wrkdir/tnftp; env $BSTRAP_ENV CPPFLAGS=\"$CPPFLAGS $tnftpxflags\" $shprog ./configure $configure_quiet_flags --prefix=$prefix --mandir=$mandir --sysconfdir=$sysconfdir && $bmake 
&& (cd src && $bmake install))"
+       run_cmd "(cd $wrkdir/tnftp; env $BSTRAP_ENV CPPFLAGS=\"$CPPFLAGS $tnftpxflags\" $shprog ./configure $configure_quiet_flags --prefix=$prefix --mandir=$mandir --sysconfdir=$sysconfdir && 
$sedprog -e 's|-ledit|../libedit/libedit.a|' < src/Makefile > src/Makefile.tmp && mv src/Makefile.tmp src/Makefile && $bmake && (cd src && $bmake install))"
        ;;
 esac