From owner-p4-projects@FreeBSD.ORG  Wed Nov 14 01:08:14 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id BD4B3267; Wed, 14 Nov 2012 01:08:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 73E51265
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 01:08:13 +0000 (UTC)
 (envelope-from bz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 596B28FC13
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 01:08:13 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAE18D78049885
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 01:08:13 GMT
 (envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAE18DfF049882
 for perforce@freebsd.org; Wed, 14 Nov 2012 01:08:13 GMT
 (envelope-from bz@freebsd.org)
Date: Wed, 14 Nov 2012 01:08:13 GMT
Message-Id: <201211140108.qAE18DfF049882@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: PERFORCE change 219777 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Nov 2012 01:08:14 -0000

http://p4web.freebsd.org/@@219777?ac=10

Change 219777 by bz@bz_zenith on 2012/11/14 01:08:02

	Move -lm into the amd64 section for now. libvuln_png does not
	need it anymore.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/Makefile#4 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/Makefile#4 (text+ko) ====

@@ -16,12 +16,12 @@
 CFLAGS+=	-I${.CURDIR}/../../../ctsrd-lib/libimagebox
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+=	-I/usr/local/include
-LDADD+=		-L/usr/local/lib -lpng
+LDADD+=		-L/usr/local/lib -lpng -lm
 .else
 CFLAGS+=	-I${.CURDIR}/../../libvuln_png
 LDADD+=		-lvuln_png
 .endif
-LDADD+=		-lz -lm
+LDADD+=		-lz
 
 WARNS=	6