From owner-freebsd-bugs@FreeBSD.ORG Tue Jul 27 23:30:01 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDAA71065672 for ; Tue, 27 Jul 2010 23:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id ABABE8FC0A for ; Tue, 27 Jul 2010 23:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6RNU1uJ055461 for ; Tue, 27 Jul 2010 23:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6RNU1a4055460; Tue, 27 Jul 2010 23:30:01 GMT (envelope-from gnats) Resent-Date: Tue, 27 Jul 2010 23:30:01 GMT Resent-Message-Id: <201007272330.o6RNU1a4055460@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Tuco Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E17F7106567A for ; Tue, 27 Jul 2010 23:23:33 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id B6CB38FC26 for ; Tue, 27 Jul 2010 23:23:33 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o6RNNXR3014383 for ; Tue, 27 Jul 2010 23:23:33 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o6RNNXf3014376; Tue, 27 Jul 2010 23:23:33 GMT (envelope-from nobody) Message-Id: <201007272323.o6RNNXf3014376@www.freebsd.org> Date: Tue, 27 Jul 2010 23:23:33 GMT From: Tuco To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/149013: make ZFS makefiles use the libraries from build directory X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jul 2010 23:30:02 -0000 >Number: 149013 >Category: misc >Synopsis: make ZFS makefiles use the libraries from build directory >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jul 27 23:30:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Tuco >Release: Debian GNU/kFreeBSD >Organization: >Environment: >Description: This patch makes ZFS makefiles use the libraries from build directory instead of installed ones. Useful in situations where these libraries might not be installed (which is unlikely on FreeBSD, but not so unlikely on Debian GNU/kFreeBSD). >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ur cddl/lib/libzfs/Makefile cddl/lib/libzfs/Makefile --- cddl/lib/libzfs/Makefile 2008-11-17 15:49:29.000000000 -0500 +++ cddl/lib/libzfs/Makefile 2010-07-27 19:02:11.875304603 -0400 @@ -47,5 +47,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../lib/libgeom .include diff -ur cddl/sbin/zfs/Makefile cddl/sbin/zfs/Makefile --- cddl/sbin/zfs/Makefile 2008-03-27 19:21:25.000000000 -0400 +++ cddl/sbin/zfs/Makefile 2010-07-27 19:02:12.186072143 -0400 @@ -24,4 +24,10 @@ LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ -lm -lnvpair -luutil -lutil +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs \ + -L${.CURDIR}/../../../cddl/lib/libnvpair \ + -L${.CURDIR}/../../../cddl/lib/libuutil \ + -L${.CURDIR}/../../../lib/libgeom \ + -L${.CURDIR}/../../../lib/libsbuf + .include diff -ur cddl/sbin/zpool/Makefile cddl/sbin/zpool/Makefile --- cddl/sbin/zpool/Makefile 2008-11-17 15:49:29.000000000 -0500 +++ cddl/sbin/zpool/Makefile 2010-07-27 19:02:46.066584053 -0400 @@ -26,4 +26,9 @@ LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \ -lm -lnvpair -luutil -lutil +LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl \ + -L${.CURDIR}/../../../cddl/lib/libzfs \ + -L${.CURDIR}/../../../cddl/lib/libnvpair \ + -L${.CURDIR}/../../../cddl/lib/libuutil + .include >Release-Note: >Audit-Trail: >Unformatted: