diff options
author | Yuta Satoh <nigoro.dev@gmail.com> | 2018-01-02 21:53:21 +0900 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2018-01-02 17:51:12 +0100 |
commit | f7a1b8befe4d9e75e09387616a9d2aea57164727 (patch) | |
tree | c99816da346349faca6869bcf2d76cc4b00ba31d /sys-freebsd/freebsd-cddl | |
parent | virtualbox packages: Removed old. (diff) | |
download | gentoo-f7a1b8befe4d9e75e09387616a9d2aea57164727.tar.gz gentoo-f7a1b8befe4d9e75e09387616a9d2aea57164727.tar.bz2 gentoo-f7a1b8befe4d9e75e09387616a9d2aea57164727.zip |
sys-freebsd: remove 10.3 and 11.0.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'sys-freebsd/freebsd-cddl')
5 files changed, 0 insertions, 386 deletions
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest index b8cc1045daa6..e179eb2396a8 100644 --- a/sys-freebsd/freebsd-cddl/Manifest +++ b/sys-freebsd/freebsd-cddl/Manifest @@ -8,8 +8,6 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch deleted file mode 100644 index 9af7cfbb8c31..000000000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile -index d8bcccb..2cebbcb 100644 ---- a/cddl/lib/libzfs/Makefile -+++ b/cddl/lib/libzfs/Makefile -@@ -59,6 +59,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common - -diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile -index 262d3e9..9643210 100644 ---- a/cddl/lib/libzfs_core/Makefile -+++ b/cddl/lib/libzfs_core/Makefile -@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+ - .include <bsd.lib.mk> -diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile -index 83cefca..55c56d5 100644 ---- a/cddl/lib/libzpool/Makefile -+++ b/cddl/lib/libzpool/Makefile -@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread - CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+ - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \ - ${LIBAVL} ${LIBUMEM} - LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem -diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile -index 1f909aa..2590302 100644 ---- a/cddl/sbin/zfs/Makefile -+++ b/cddl/sbin/zfs/Makefile -@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \ - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} - LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs -diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile -index 4b5b898..f89d010 100644 ---- a/cddl/sbin/zpool/Makefile -+++ b/cddl/sbin/zpool/Makefile -@@ -27,6 +27,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} - LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs -diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile -index 6cb9529..e76fbc4 100644 ---- a/cddl/usr.bin/ctfconvert/Makefile -+++ b/cddl/usr.bin/ctfconvert/Makefile -@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile -index 673c7e3..5fff940 100644 ---- a/cddl/usr.bin/ctfmerge/Makefile -+++ b/cddl/usr.bin/ctfmerge/Makefile -@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile -index b6605cb..7028630 100644 ---- a/cddl/usr.bin/zinject/Makefile -+++ b/cddl/usr.bin/zinject/Makefile -@@ -21,6 +21,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool -diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile -index 888b9af..523ba44 100644 ---- a/cddl/usr.bin/zstreamdump/Makefile -+++ b/cddl/usr.bin/zstreamdump/Makefile -@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl -diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile -index f6f7e03..6fed691 100644 ---- a/cddl/usr.bin/ztest/Makefile -+++ b/cddl/usr.bin/ztest/Makefile -@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL} - LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \ -diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile -index fb5729f..ea9a752 100644 ---- a/cddl/usr.sbin/dtrace/Makefile -+++ b/cddl/usr.sbin/dtrace/Makefile -@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ - LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ - -lrtld_db - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - .include <bsd.prog.mk> -diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile -index ccd8189..827a197 100644 ---- a/cddl/usr.sbin/lockstat/Makefile -+++ b/cddl/usr.sbin/lockstat/Makefile -@@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - - CFLAGS+= -DNEED_ERRLOC -g - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - #YFLAGS+= -d - - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ -diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile -index c2a6b1d..f411fc0 100644 ---- a/cddl/usr.sbin/zdb/Makefile -+++ b/cddl/usr.sbin/zdb/Makefile -@@ -24,6 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool -diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile -index 1957aad..9a5570a 100644 ---- a/cddl/usr.sbin/zhack/Makefile -+++ b/cddl/usr.sbin/zhack/Makefile -@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch deleted file mode 100644 index c8ce8e1a2943..000000000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile -index 2a66337..04988d7 100644 ---- a/cddl/lib/libzfs/Makefile -+++ b/cddl/lib/libzfs/Makefile -@@ -12,6 +12,7 @@ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ - - LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \ - -lbsdxml -lgeom -lnvpair -lz -lzfs_core -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl - - SRCS= deviceid.c \ - fsshare.c \ diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild deleted file mode 100644 index 44c9ae6d6386..000000000000 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd toolchain-funcs multilib - -DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" -SLOT="0" - -IUSE="build" -LICENSE="CDDL GPL-2" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -# sys is required. -EXTRACTONLY=" - cddl/ - contrib/ - usr.bin/ - lib/ - sbin/ - sys/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - =sys-freebsd/freebsd-libexec-${RV}* - build? ( sys-apps/baselayout )" - -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - !build? ( =sys-freebsd/freebsd-sources-${RV}* )" - -S="${WORKDIR}/cddl" - -PATCHES=( - "${FILESDIR}/${PN}-10.2-libpaths.patch" - "${FILESDIR}/${PN}-10.3-underlink.patch" - ) - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="include/ " -} - -src_prepare() { - if [[ ! -e "${WORKDIR}/include" ]]; then - # Link in include headers. - ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." - fi -} - -src_compile() { - # Disable parallel make. - freebsd_src_compile -j1 -} - -src_install() { - # Install libraries proper place - local mylibdir=$(get_libdir) - mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die - - gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core - - # Install zfs volinit script. - newinitd "${FILESDIR}"/zvol.initd-9.0 zvol - - # Install zfs script - newinitd "${FILESDIR}"/zfs.initd zfs - - keepdir /etc/zfs -} diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild deleted file mode 100644 index cebbb02e7f49..000000000000 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd toolchain-funcs multilib - -DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" -SLOT="0" - -IUSE="build" -LICENSE="CDDL GPL-2" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -# sys is required. -EXTRACTONLY=" - cddl/ - contrib/ - usr.bin/ - lib/ - sbin/ - sys/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - =sys-freebsd/freebsd-libexec-${RV}* - build? ( sys-apps/baselayout )" - -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - !build? ( =sys-freebsd/freebsd-sources-${RV}* )" - -S="${WORKDIR}/cddl" - -PATCHES=( "${FILESDIR}/${PN}-11.0-workaround.patch" - "${FILESDIR}/${PN}-11.0-add-libs.patch" ) - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="include/ " - [[ $(tc-getCXX) != *clang++* ]] && REMOVE_SUBDIRS="usr.sbin/zfsd" -} - -src_prepare() { - if [[ ! -e "${WORKDIR}/include" ]]; then - # Link in include headers. - ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." - fi - for d in libavl libctf libdtrace libnvpair libumem libuutil libzfs libzfs_core libzpool; do - LDFLAGS="${LDFLAGS} -L${S}/lib/${d}" - done -} - -src_compile() { - cd "${S}"/lib || die - freebsd_src_compile - cd "${S}" || die - freebsd_src_compile -} - -src_install() { - # Install libraries proper place - local mylibdir=$(get_libdir) - freebsd_src_install SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" - - gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core - - # Install zfs volinit script. - newinitd "${FILESDIR}"/zvol.initd-9.0 zvol - - # Install zfs script - newinitd "${FILESDIR}"/zfs.initd zfs - - keepdir /etc/zfs -} |