>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 <bsd.lib.mk>
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 <bsd.prog.mk>
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 <bsd.prog.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "[email protected]"
