From owner-svn-src-head@FreeBSD.ORG  Sat Apr 18 06:01:55 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EB89A106564A;
	Sat, 18 Apr 2009 06:01:55 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D9E348FC12;
	Sat, 18 Apr 2009 06:01:55 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3I61tQq057452;
	Sat, 18 Apr 2009 06:01:55 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3I61tfE057451;
	Sat, 18 Apr 2009 06:01:55 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200904180601.n3I61tfE057451@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 18 Apr 2009 06:01:55 +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: r191239 - head/rescue/rescue
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Apr 2009 06:01:56 -0000

Author: kientzle
Date: Sat Apr 18 06:01:55 2009
New Revision: 191239
URL: http://svn.freebsd.org/changeset/base/191239

Log:
  Libarchive is sprouting dependencies on libmd and libcrypto.
  Because crunchgen drops any repeated library (keeping only the
  first), the -lcrypto reference must be moved to after -larchive,
  not merely duplicated.
  
  I'm considering changing crunchgen's handling of duplicate
  libraries, but that's a rather more delicate issue.

Modified:
  head/rescue/rescue/Makefile

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Sat Apr 18 04:45:02 2009	(r191238)
+++ head/rescue/rescue/Makefile	Sat Apr 18 06:01:55 2009	(r191239)
@@ -73,9 +73,6 @@ CRUNCH_PROGS_bin= cat chflags chio chmod
 	 ed expr getfacl hostname kenv kill ln ls mkdir mv	\
 	 pkill ps pwd realpath rm rmdir setfacl sh stty sync test
 CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lm -ltermcap -lutil
-.if ${MK_OPENSSL} != "no"
-CRUNCH_LIBS+= -lcrypto
-.endif
 
 # Additional options for specific programs
 CRUNCH_ALIAS_test= [
@@ -201,7 +198,10 @@ CRUNCH_ALIAS_bzip2= bunzip2 bzcat
 CRUNCH_LIBS+= -lbz2
 
 CRUNCH_PROGS_usr.bin+= tar
-CRUNCH_LIBS+= -larchive
+CRUNCH_LIBS+= -larchive -lmd
+.if ${MK_OPENSSL} != "no"
+CRUNCH_LIBS+= -lcrypto
+.endif
 
 CRUNCH_PROGS_usr.bin+= vi
 CRUNCH_ALIAS_vi= ex