From owner-svn-src-all@FreeBSD.ORG Thu Feb 25 21:26:50 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0D2C106564A; Thu, 25 Feb 2010 21:26:50 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D12AF8FC0A; Thu, 25 Feb 2010 21:26:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PLQoZp040495; Thu, 25 Feb 2010 21:26:50 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1PLQolo040493; Thu, 25 Feb 2010 21:26:50 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201002252126.o1PLQolo040493@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Thu, 25 Feb 2010 21:26:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204334 - head/secure/libexec/sftp-server X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 21:26:51 -0000 Author: des Date: Thu Feb 25 21:26:50 2010 New Revision: 204334 URL: http://svn.freebsd.org/changeset/base/204334 Log: Remove -static; it was a failed experiment that got committed by accident. Modified: head/secure/libexec/sftp-server/Makefile Modified: head/secure/libexec/sftp-server/Makefile ============================================================================== --- head/secure/libexec/sftp-server/Makefile Thu Feb 25 21:21:34 2010 (r204333) +++ head/secure/libexec/sftp-server/Makefile Thu Feb 25 21:26:50 2010 (r204334) @@ -5,8 +5,11 @@ SRCS= sftp-server.c sftp-common.c sftp MAN= sftp-server.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h +# required when linking with a dynamic libssh +SRCS+= roaming_dummy.c + DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lcrypt -lcrypto -lz -static -lssh +LDADD= -lcrypt -lcrypto -lz -lssh .include