diff options
| author | grant <grant@pkgsrc.org> | 2003-10-12 10:13:53 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2003-10-12 10:13:53 +0000 |
| commit | 63054249c73d6852afe418ee590fe327d0428518 (patch) | |
| tree | d6c8ebb4fe17b7ca626ea3061fd1c2a15b6e2574 | |
| parent | db20aa3e21aed7ebbf37309c630afd0a65d66839 (diff) | |
| download | pkgsrc-63054249c73d6852afe418ee590fe327d0428518.tar.gz | |
set LD=CC again for all platforms with an appropriate comment - I
don't know why this didn't originally work as it should, but I've
just tested it with gcc3 and Forte 8 on Solaris and I couldn't make
it fail.
fixes coredump problem on Solaris observed by some, and also
PR pkg/23120 from Alex Gerasimoff.
bump PKGREVISION to differentiate between broken and unbroken
package.
| -rw-r--r-- | security/openssh/Makefile | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index aade07cb3fa..6959cb91eb6 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.118 2003/10/12 08:25:17 grant Exp $ +# $NetBSD: Makefile,v 1.119 2003/10/12 10:13:53 grant Exp $ DISTNAME= openssh-3.7.1p2 PKGNAME= openssh-3.7.1.2 +PKGREVISION= 1 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ @@ -68,18 +69,19 @@ CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER} #MESSAGE_SRC+= ${.CURDIR}/MESSAGE.pam #.endif -.if ${OPSYS} == "SunOS" -LIBS+= -lc -.else -LD=${CC} -.endif - +# the openssh configure script finds and uses ${LD} if defined and +# defaults to ${CC} if not. we override LD here, since running the +# linker directly results in undefined symbols for obvious reasons. +# +LD= ${CC} +# s/key support, enabled on Darwin and Solaris. NetBSD s/key has 4 args +# (4: sslen) to skeychallenge instead of 3, so disable s/key support. +# .if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" . include "../../security/skey/buildlink2.mk" CONFIGURE_ARGS+= --with-skey=${BUILDLINK_PREFIX.skey} .elif ${OPSYS} == "NetBSD" -# XXX: NetBSD has 4 args (4: sslen) to skeychallenge instead of 3 #CONFIGURE_ARGS+= --with-skey=/usr CONFIGURE_ARGS+= --without-skey .else @@ -87,7 +89,7 @@ CONFIGURE_ARGS+= --without-skey .endif .if defined(KERBEROS) -PKG_USE_KERBEROS= yes +PKG_USE_KERBEROS= yes CONFIGURE_ARGS+= --with-kerberos4=/usr CONFIGURE_ARGS+= --with-kerberos5=/usr CPPFLAGS+= -I/usr/include/krb5 |