diff options
| author | schmonz <schmonz@pkgsrc.org> | 2007-05-23 04:20:36 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2007-05-23 04:20:36 +0000 |
| commit | bef85688257e92bf1573d77fc1c1d9c21d1e63ae (patch) | |
| tree | 9ddb809acd0fcdc42d6ce3210735526fd195874b /bootstrap | |
| parent | 9fc5d079a5512813966548eabffe4d576fc775e8 (diff) | |
| download | pkgsrc-bef85688257e92bf1573d77fc1c1d9c21d1e63ae.tar.gz | |
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 (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 21306a4d83c..87f607285a1 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -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 @@ yes) # bootstrap tnftp 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 |