diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-01-21 10:57:45 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-01-21 10:57:45 +0000 |
| commit | ca04c57ca94ab923e998eacf1dde2cc8a43435ac (patch) | |
| tree | 39b333939f62760902090bc1b1ea0199f9f77864 /crypto | |
| parent | ba76113f61baeb465b0c67fc950c73dad54d8975 (diff) | |
| download | src-ca04c57ca94ab923e998eacf1dde2cc8a43435ac.tar.gz src-ca04c57ca94ab923e998eacf1dde2cc8a43435ac.zip | |
Take care not to pick up the wrong version of OpenSSL when running in an
environment that has OpenSSL from ports in addition to the base version.
Notes
Notes:
svn path=/head/; revision=294494
Diffstat (limited to 'crypto')
| -rwxr-xr-x | crypto/openssh/freebsd-configure.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/openssh/freebsd-configure.sh b/crypto/openssh/freebsd-configure.sh index dd336bd76193..0f37eb9c8fa3 100755 --- a/crypto/openssh/freebsd-configure.sh +++ b/crypto/openssh/freebsd-configure.sh @@ -7,6 +7,7 @@ configure_args=" --prefix=/usr --sysconfdir=/etc/ssh --with-pam + --with-ssl-dir=/usr --with-tcp-wrappers --with-libedit --with-ssl-engine @@ -18,11 +19,16 @@ set -e # make sure configure uses the correct compiler export CC=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCC) export CPP=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCPP) +unset CFLAGS CPPFLAGS LDFLAGS LIBS # regenerate configure and config.h.in autoheader autoconf +# reset PATH to avoid picking up the wrong libraries +export PATH=/bin:/sbin:/usr/bin:/usr/sbin +unset LD_LIBRARY_PATH + # generate config.h with krb5 and stash it sh configure $configure_args --with-kerberos5 mv config.log config.log.orig |