From dd7038cbf7b53c86d7f2271eefdbf385e702d918 Mon Sep 17 00:00:00 2001 From: Yuta SATOH Date: Tue, 13 Aug 2013 20:05:04 +0900 Subject: sys-freebsd/*-9.9999: sync to 9.2_rc1 ebuild. --- sys-freebsd/freebsd-cddl/Manifest | 4 ++-- .../files/freebsd-cddl-9.2-underlink.patch | 24 ++++++++++++++++++++++ .../freebsd-cddl/freebsd-cddl-9.9999.ebuild | 10 +++++---- 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch (limited to 'sys-freebsd/freebsd-cddl') diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest index 2c8924a..1c9a102 100644 --- a/sys-freebsd/freebsd-cddl/Manifest +++ b/sys-freebsd/freebsd-cddl/Manifest @@ -2,7 +2,7 @@ AUX freebsd-cddl-9.0-bsdxml.patch 1419 SHA256 0a5c5f5b242e17d0a378778ec39ff43d41 AUX freebsd-cddl-9.0-libpaths.patch 7621 SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278 WHIRLPOOL 1f6798ac319bba9dedb0a0776e09cbce01637e057e38f77d59410c942f68c7051b7ccc10bfed748b72eeabf9254bc52262b5c9cc3fa3a4187f8698ede2d27d4f AUX freebsd-cddl-9.0-underlink.patch 755 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9 WHIRLPOOL c6403e8e56f2c2e9d67387137eab77eae0f6e1a8c4c4d595c1950ee3ab3bff8d0d8a0f15ca83a7b65aa05d35dafa86ff75ff8fec7ce8f320a2e1d44be38c0995 AUX freebsd-cddl-9.2-libpaths.patch 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643 +AUX freebsd-cddl-9.2-underlink.patch 924 SHA256 d60e1ce05468ed95b9179c819693f0eb3bbbf89e79fc2d1622d81858aa84bf2d SHA512 aca1093f050463d9fa3feefda73c1e150f5fff79d44079aa10d14ab972dfedcb0fec27e931972e5f518716b4bdcff0c05b66d134fffe57ee546c4e5cdc53bcea WHIRLPOOL 2257ceb51964183694dae2c561c658266f436396d3788dd76963216ce7a06dff6b6b4aa2b02508a9e2c4dc943cf580d8002947ec493dc15e97029dfbe540b22d AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87 -EBUILD freebsd-cddl-9.2.9999_p253912.ebuild 1453 SHA256 7df02d86f5c25e34a973a10dd38767822f2f926d167050ee8adc7c325e3defb1 SHA512 17bab0702255841f961c9639ad6a33e5d538b2309b86344b65e7d59421ad599bcb89f49c18742c45f527a692bdf01f738c1e2d39ffb595df3bbaff3e4e8743ed WHIRLPOOL f557b2cb24baf4e8c4b3996abf0eb9f22b5ee86691bc5519f7181a4fe12880bff1434b4b7c71832e580d93bb18da8443d702b53f97c02a56d3de27cab8ce43b3 -EBUILD freebsd-cddl-9.9999.ebuild 1453 SHA256 7df02d86f5c25e34a973a10dd38767822f2f926d167050ee8adc7c325e3defb1 SHA512 17bab0702255841f961c9639ad6a33e5d538b2309b86344b65e7d59421ad599bcb89f49c18742c45f527a692bdf01f738c1e2d39ffb595df3bbaff3e4e8743ed WHIRLPOOL f557b2cb24baf4e8c4b3996abf0eb9f22b5ee86691bc5519f7181a4fe12880bff1434b4b7c71832e580d93bb18da8443d702b53f97c02a56d3de27cab8ce43b3 +EBUILD freebsd-cddl-9.9999.ebuild 1488 SHA256 492cdc15fef9e873347cd200c0394b0ffe0826f2074b014f34f372982bb368b7 SHA512 19d4ace1b3b755a2b283498fe1f2264e757cd67611dc0f8fc847e9175aaa5152ed6cf0ac27a8e1abaa26c2d7a1ea42b386d240356b88f3ec8d03831b13bf1abe WHIRLPOOL 6aa2289d3176b5e185f3fc262edc18820c0ca8ee2d1dc703c9ee5847414b6457c8c4a1ee560e4793dd8aa492054ba39e540c5c3fb38b94d03c7bccb4e8c75fa1 diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch new file mode 100644 index 0000000..19d1e30 --- /dev/null +++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch @@ -0,0 +1,24 @@ +diff -uNr cddl.old/lib/libzfs/Makefile cddl/lib/libzfs/Makefile +--- cddl.old/lib/libzfs/Makefile 2013-08-09 17:37:00.000000000 -0400 ++++ cddl/lib/libzfs/Makefile 2013-08-09 17:44:08.000000000 -0400 +@@ -8,7 +8,7 @@ + LIB= zfs + DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ + ${LIBZFS_CORE} +-LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core ++LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core -lgeom -luutil -lavl + + SRCS= deviceid.c \ + fsshare.c \ +diff -uNr cddl.old/lib/libzpool/Makefile cddl/lib/libzpool/Makefile +--- cddl.old/lib/libzpool/Makefile 2013-08-09 17:46:23.000000000 -0400 ++++ cddl/lib/libzpool/Makefile 2013-08-09 17:50:39.000000000 -0400 +@@ -61,7 +61,7 @@ + LDFLAGS+= -L${.CURDIR}/../../lib/libumem + + DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} +-LDADD= -lmd -lpthread -lz ++LDADD= -lmd -lpthread -lz -lumem -lavl + + # atomic.S doesn't like profiling. + NO_PROFILE= diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild index 5749239..d4f39df 100644 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild +++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild @@ -27,8 +27,7 @@ fi RDEPEND="=sys-freebsd/freebsd-lib-${RV}* =sys-freebsd/freebsd-libexec-${RV}* - build? ( sys-apps/baselayout ) - dev-libs/libelf" + build? ( sys-apps/baselayout )" DEPEND="${RDEPEND} =sys-freebsd/freebsd-mk-defs-${RV}* @@ -36,7 +35,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}/cddl" -PATCHES=( "${FILESDIR}/${PN}-9.2-libpaths.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-9.2-libpaths.patch" + "${FILESDIR}/${PN}-9.2-underlink.patch" + ) src_unpack() { freebsd_src_unpack @@ -49,7 +51,7 @@ src_install() { local mylibdir=$(get_libdir) mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die - gen_usr_ldscript -a avl nvpair umem uutil zfs zpool + gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core # Install zfs volinit script. newinitd "${FILESDIR}"/zvol.initd-9.0 zvol -- cgit v1.2.3-65-gdbad