Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Apr 2002 18:02:33 -0800 (PST)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 9078 for review
Message-ID:  <200204050202.g3522XQ17788@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9078

Change 9078 by peter@peter_daintree on 2002/04/04 18:02:06

	back out local addition of -lz for static linking support.
	the static linked sshd was handy, but is no longer required.

Affected files ...

... //depot/projects/ia64/secure/libexec/sftp-server/Makefile#4 edit
... //depot/projects/ia64/secure/usr.bin/scp/Makefile#5 edit
... //depot/projects/ia64/secure/usr.bin/sftp/Makefile#5 edit
... //depot/projects/ia64/secure/usr.bin/ssh-add/Makefile#4 edit
... //depot/projects/ia64/secure/usr.bin/ssh-agent/Makefile#4 edit
... //depot/projects/ia64/secure/usr.bin/ssh-keygen/Makefile#4 edit
... //depot/projects/ia64/secure/usr.bin/ssh-keyscan/Makefile#4 edit

Differences ...

==== //depot/projects/ia64/secure/libexec/sftp-server/Makefile#4 (text+ko) ====

@@ -5,8 +5,8 @@
 SRCS=   sftp-server.c sftp-common.c
 MAN=	sftp-server.8
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lssh -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/scp/Makefile#5 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	scp
 SRCS=	scp.c
 
-DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD=	-lssh -lcrypto -lz
+DPADD=	${LIBSSH}
+LDADD=	-lssh
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/sftp/Makefile#5 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
 
-LDADD=	-lssh -lcrypto -lz
-DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypto
+DPADD=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/ssh-add/Makefile#4 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	ssh-add
 SRCS=	ssh-add.c
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lssh -lcrypto
+DPADD+= ${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/ssh-agent/Makefile#4 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	ssh-agent
 SRCS=	ssh-agent.c
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lssh -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/ssh-keygen/Makefile#4 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	ssh-keygen
 SRCS=	ssh-keygen.c
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPTO}
+LDADD+=	-lssh -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

==== //depot/projects/ia64/secure/usr.bin/ssh-keyscan/Makefile#4 (text+ko) ====

@@ -4,8 +4,8 @@
 PROG=	ssh-keyscan
 SRCS=	ssh-keyscan.c
 
-LDADD+=	-lssh -lcrypto -lz
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lssh -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204050202.g3522XQ17788>