diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-11-07 12:42:54 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-11-07 12:42:54 +0000 |
| commit | 924e9525c1f21fff0c0f74964d9ff80f264211f6 (patch) | |
| tree | 1e93857ca8ec33cdad2cd6c05bc0c3cffa80e5b3 /sys-freebsd/freebsd-cddl/files | |
| parent | version bump (diff) | |
| download | historical-924e9525c1f21fff0c0f74964d9ff80f264211f6.tar.gz historical-924e9525c1f21fff0c0f74964d9ff80f264211f6.tar.bz2 historical-924e9525c1f21fff0c0f74964d9ff80f264211f6.zip | |
bump to 9.0_rc1
Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64
Diffstat (limited to 'sys-freebsd/freebsd-cddl/files')
| -rw-r--r-- | sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch | 28 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch | 22 |
2 files changed, 50 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch new file mode 100644 index 000000000000..b3d95bb7741e --- /dev/null +++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch @@ -0,0 +1,28 @@ +diff -ur cddl.old/sbin/zfs/Makefile cddl/sbin/zfs/Makefile +--- cddl.old/sbin/zfs/Makefile 2011-11-04 10:01:46.000000000 +0000 ++++ cddl/sbin/zfs/Makefile 2011-11-04 10:07:15.000000000 +0000 +@@ -21,8 +21,8 @@ + CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys + CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs + +-DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ ++DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ + ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} +-LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs ++LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs + + .include <bsd.prog.mk> +diff -ur cddl.old/sbin/zpool/Makefile cddl/sbin/zpool/Makefile +--- cddl.old/sbin/zpool/Makefile 2011-11-04 10:01:46.000000000 +0000 ++++ cddl/sbin/zpool/Makefile 2011-11-04 10:06:38.000000000 +0000 +@@ -26,8 +26,8 @@ + CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common + CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common + +-DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ ++DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ + ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} +-LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs ++LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs + + .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch new file mode 100644 index 000000000000..ff87d2c6ef9b --- /dev/null +++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch @@ -0,0 +1,22 @@ +--- cddl/lib/libzfs/Makefile.old 2011-11-04 10:27:30.000000000 +0000 ++++ cddl/lib/libzfs/Makefile 2011-11-04 10:28:59.000000000 +0000 +@@ -7,7 +7,7 @@ + + LIB= zfs + DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} +-LDADD= -lmd -lpthread -lumem -lutil ++LDADD= -lmd -lpthread -lumem -lutil -luutil -lnvpair -lm -lgeom + + SRCS= deviceid.c \ + fsshare.c \ +--- cddl/lib/libzpool/Makefile.old 2011-11-04 18:22:28.000000000 +0000 ++++ cddl/lib/libzpool/Makefile 2011-11-04 18:24:01.000000000 +0000 +@@ -57,7 +57,7 @@ + CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include + + DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} +-LDADD= -lmd -lpthread -lz ++LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl + + # atomic.S doesn't like profiling. + NO_PROFILE= |