From owner-svn-src-all@FreeBSD.ORG  Sat Nov 15 18:03:39 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1D07DF97;
 Sat, 15 Nov 2014 18:03:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 09DD7362;
 Sat, 15 Nov 2014 18:03:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAFI3c6A045908;
 Sat, 15 Nov 2014 18:03:38 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAFI3cEk045907;
 Sat, 15 Nov 2014 18:03:38 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201411151803.sAFI3cEk045907@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Sat, 15 Nov 2014 18:03:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274552 - head/usr.bin/sort
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Nov 2014 18:03:39 -0000

Author: sbruno
Date: Sat Nov 15 18:03:38 2014
New Revision: 274552
URL: https://svnweb.freebsd.org/changeset/base/274552

Log:
  Change LDFLAGS to LDADD in order to allow static builds.  This is more
  proper way to ensure that the command line compile works the way we intend.
  
  Add explicity DPADD statemens on LIBMD and LIBPTHREAD depending on which
  options are used in the build.
  
  Reviewed by:	andrew
  MFC after:	2 weeks

Modified:
  head/usr.bin/sort/Makefile

Modified: head/usr.bin/sort/Makefile
==============================================================================
--- head/usr.bin/sort/Makefile	Sat Nov 15 14:55:05 2014	(r274551)
+++ head/usr.bin/sort/Makefile	Sat Nov 15 18:03:38 2014	(r274552)
@@ -13,10 +13,12 @@ CLEANFILES+= sort.1
 
 .if ${MK_SORT_THREADS} != "no"
 CFLAGS+= -DSORT_THREADS
-LDFLAGS+= -lpthread -lmd
+LDADD= -lpthread -lmd
+DPADD= ${LIBPTHREAD} ${LIBMD}
 MAN_SUB+= -e 's|%%THREADS%%||g'
 .else
-LDFLAGS+= -lmd
+LDADD= -lmd
+DPADD= ${LIBMD}
 MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
 .endif