| 1 |
the_paya 09/01/23 22:40:33 |
| 2 |
|
| 3 |
Added: freebsd-cddl-7.1-libpaths.patch |
| 4 |
freebsd-cddl-7.1-xdr_header.patch |
| 5 |
Log: |
| 6 |
Import from gentoo-bsd overlay of ZFS userland for Gentoo/FreeBSD. |
| 7 |
(Portage version: 2.2_rc23/cvs/FreeBSD i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: freebsd-cddl-7.1-libpaths.patch |
| 16 |
=================================================================== |
| 17 |
diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile |
| 18 |
--- cddl.orig/lib/libzfs/Makefile 2008-06-22 10:26:18 -0300 |
| 19 |
+++ cddl/lib/libzfs/Makefile 2008-06-22 10:26:26 -0300 |
| 20 |
@@ -7,7 +7,7 @@ |
| 21 |
|
| 22 |
LIB= zfs |
| 23 |
DPADD= ${LIBUTIL} |
| 24 |
-LDADD= -lutil |
| 25 |
+LDADD= -lutil -lgeom -lm |
| 26 |
|
| 27 |
SRCS= deviceid.c \ |
| 28 |
mnttab.c \ |
| 29 |
diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile |
| 30 |
--- cddl.orig/lib/libzpool/Makefile 2008-06-22 10:35:15 -0300 |
| 31 |
+++ cddl/lib/libzpool/Makefile 2008-06-22 10:37:06 -0300 |
| 32 |
@@ -42,7 +42,8 @@ |
| 33 |
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair |
| 34 |
|
| 35 |
DPADD= ${LIBPTHREAD} ${LIBZ} |
| 36 |
-LDADD= -lpthread -lz |
| 37 |
+LDADD= -lpthread -lz -lavl |
| 38 |
+LDFLAGS+= -L${.CURDIR}/../libavl |
| 39 |
|
| 40 |
# atomic.S doesn't like profiling. |
| 41 |
NO_PROFILE= |
| 42 |
diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile |
| 43 |
--- cddl.orig/sbin/zfs/Makefile 2008-06-22 10:02:30 -0300 |
| 44 |
+++ cddl/sbin/zfs/Makefile 2008-06-22 10:14:23 -0300 |
| 45 |
@@ -23,5 +23,7 @@ |
| 46 |
${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} |
| 47 |
LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ |
| 48 |
-lm -lnvpair -luutil -lutil |
| 49 |
+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \ |
| 50 |
+ -L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib |
| 51 |
|
| 52 |
.include <bsd.prog.mk> |
| 53 |
diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile |
| 54 |
--- cddl.orig/sbin/zpool/Makefile 2008-06-22 10:02:30 -0300 |
| 55 |
+++ cddl/sbin/zpool/Makefile 2008-06-22 10:14:47 -0300 |
| 56 |
@@ -23,5 +23,7 @@ |
| 57 |
${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} |
| 58 |
LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \ |
| 59 |
-lm -lnvpair -luutil -lutil |
| 60 |
+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib \ |
| 61 |
+ -L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil |
| 62 |
|
| 63 |
.include <bsd.prog.mk> |
| 64 |
diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile |
| 65 |
--- cddl.orig/usr.bin/ztest/Makefile 2008-06-22 10:02:30 -0300 |
| 66 |
+++ cddl/usr.bin/ztest/Makefile 2008-06-22 10:12:40 -0300 |
| 67 |
@@ -18,5 +18,7 @@ |
| 68 |
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 69 |
${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
| 70 |
LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
| 71 |
+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \ |
| 72 |
+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib |
| 73 |
|
| 74 |
.include <bsd.prog.mk> |
| 75 |
diff -ru cddl.orig/usr.sbin/zdb/Makefile cddl/usr.sbin/zdb/Makefile |
| 76 |
--- cddl.orig/usr.sbin/zdb/Makefile 2008-06-22 10:02:30 -0300 |
| 77 |
+++ cddl/usr.sbin/zdb/Makefile 2008-06-22 10:13:31 -0300 |
| 78 |
@@ -19,5 +19,7 @@ |
| 79 |
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 80 |
${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
| 81 |
LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
| 82 |
+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \ |
| 83 |
+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib |
| 84 |
|
| 85 |
.include <bsd.prog.mk> |
| 86 |
diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc |
| 87 |
--- cddl.orig/usr.bin/Makefile.inc 2009-01-10 07:21:10 +0000 |
| 88 |
+++ cddl/usr.bin/Makefile.inc 2009-01-10 07:18:55 +0000 |
| 89 |
@@ -1,5 +1,6 @@ |
| 90 |
# $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $ |
| 91 |
|
| 92 |
BINDIR?= /usr/bin |
| 93 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 94 |
|
| 95 |
.include "../Makefile.inc" |
| 96 |
|
| 97 |
|
| 98 |
|
| 99 |
1.1 sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch |
| 100 |
|
| 101 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch?rev=1.1&view=markup |
| 102 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch?rev=1.1&content-type=text/plain |
| 103 |
|
| 104 |
Index: freebsd-cddl-7.1-xdr_header.patch |
| 105 |
=================================================================== |
| 106 |
--- sys/cddl/compat/opensolaris/rpc/xdr.h.orig 2007-04-05 22:09:06 -0300 |
| 107 |
+++ sys/cddl/compat/opensolaris/rpc/xdr.h 2008-06-22 09:46:28 -0300 |
| 108 |
@@ -55,13 +55,6 @@ |
| 109 |
|
| 110 |
#define XDR_GET_BYTES_AVAIL 1 |
| 111 |
|
| 112 |
-struct xdr_bytesrec { |
| 113 |
- bool_t xc_is_last_record; |
| 114 |
- size_t xc_num_avail; |
| 115 |
-}; |
| 116 |
- |
| 117 |
-typedef struct xdr_bytesrec xdr_bytesrec; |
| 118 |
- |
| 119 |
/* |
| 120 |
* These are the request arguments to XDR_CONTROL. |
| 121 |
* |
Archives