From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E3C0B1381F3 for ; Tue, 13 Aug 2013 13:06:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EA4FE09FE; Tue, 13 Aug 2013 13:06:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 851BBE09FE for ; Tue, 13 Aug 2013 13:06:32 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55B2A33EB4D for ; Tue, 13 Aug 2013 13:06:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D3074E545D for ; Tue, 13 Aug 2013 13:06:29 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1376391904.dd7038cbf7b53c86d7f2271eefdbf385e702d918.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-lib/, ... X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/boot0/Manifest sys-freebsd/freebsd-bin/Manifest sys-freebsd/freebsd-cddl/Manifest sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild sys-freebsd/freebsd-contrib/Manifest sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild sys-freebsd/freebsd-lib/Manifest sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-flex.patch sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-telnet.h.patch sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild sys-freebsd/freebsd-libexec/Manifest sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild sys-freebsd/freebsd-mk-defs/Manifest sys-freebsd/freebsd-pam-modules/Manifest sys-freebsd/freebsd-pf/Manifest sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild sys-freebsd/freebsd-rescue/Manifest sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.2-pkgconfig_static_libarchive.patch sys-freebsd/freebsd-rescue/freebsd-rescue-9. 9999.ebuild sys-freebsd/freebsd-sbin/Manifest sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild sys-freebsd/freebsd-share/Manifest sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild sys-freebsd/freebsd-sources/Manifest sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild sys-freebsd/freebsd-ubin/Manifest sys-freebsd/freebsd-ubin/freebsd-ubin-9.9999.ebuild sys-freebsd/freebsd-usbin/Manifest sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild X-VCS-Directories: sys-freebsd/freebsd-usbin/ sys-freebsd/freebsd-lib/ sys-freebsd/freebsd-contrib/ sys-freebsd/freebsd-lib/files/ sys-freebsd/freebsd-sources/files/ sys-freebsd/freebsd-sources/ sys-freebsd/freebsd-libexec/ sys-freebsd/freebsd-rescue/ sys-freebsd/freebsd-pf/ sys-freebsd/freebsd-ubin/ sys-freebsd/boot0/ sys-freebsd/freebsd-rescue/files/ sys-freebsd/freebsd-cddl/files/ sys-freebsd/freebsd-share/ sys-freebsd/freebsd-pam-modules/ sys-freebsd/freebsd-bin/ sys-freebsd/freebsd-cddl/ sys-freebsd/freebsd-sbin/ sys-freebsd/freebsd-mk-defs/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: dd7038cbf7b53c86d7f2271eefdbf385e702d918 X-VCS-Branch: master Date: Tue, 13 Aug 2013 13:06:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f9bda9eb-bdf0-4f13-9338-481354dee908 X-Archives-Hash: 1886ea29c896da295f7bb020f82de0dd commit: dd7038cbf7b53c86d7f2271eefdbf385e702d918 Author: Yuta SATOH gentoo gr jp> AuthorDate: Tue Aug 13 11:05:04 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Tue Aug 13 11:05:04 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=dd7038cb sys-freebsd/*-9.9999: sync to 9.2_rc1 ebuild. --- sys-freebsd/boot0/Manifest | 1 - sys-freebsd/freebsd-bin/Manifest | 1 - sys-freebsd/freebsd-cddl/Manifest | 4 +- .../files/freebsd-cddl-9.2-underlink.patch | 24 ++++ .../freebsd-cddl/freebsd-cddl-9.9999.ebuild | 10 +- sys-freebsd/freebsd-contrib/Manifest | 3 +- .../freebsd-contrib/freebsd-contrib-9.9999.ebuild | 14 --- sys-freebsd/freebsd-lib/Manifest | 6 +- .../freebsd-lib/files/freebsd-lib-9.2-flex.patch | 13 --- .../files/freebsd-lib-9.2-liblink.patch | 55 +++++++++ .../files/freebsd-lib-9.2-telnet.h.patch | 20 ---- sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild | 127 +++++++++------------ sys-freebsd/freebsd-libexec/Manifest | 3 +- .../freebsd-libexec/freebsd-libexec-9.9999.ebuild | 16 +-- sys-freebsd/freebsd-mk-defs/Manifest | 1 - sys-freebsd/freebsd-pam-modules/Manifest | 1 - sys-freebsd/freebsd-pf/Manifest | 3 +- sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild | 2 +- sys-freebsd/freebsd-rescue/Manifest | 4 +- ...sd-rescue-9.2-pkgconfig_static_libarchive.patch | 12 -- .../freebsd-rescue/freebsd-rescue-9.9999.ebuild | 18 +-- sys-freebsd/freebsd-sbin/Manifest | 3 +- .../freebsd-sbin/freebsd-sbin-9.9999.ebuild | 2 +- sys-freebsd/freebsd-share/Manifest | 3 +- .../freebsd-share/freebsd-share-9.9999.ebuild | 2 +- sys-freebsd/freebsd-sources/Manifest | 4 +- .../files/freebsd-sources-9.2-no_ctf.patch | 28 ----- .../freebsd-sources/freebsd-sources-9.9999.ebuild | 67 +++++++---- sys-freebsd/freebsd-ubin/Manifest | 3 +- .../freebsd-ubin/freebsd-ubin-9.9999.ebuild | 19 ++- sys-freebsd/freebsd-usbin/Manifest | 3 +- .../freebsd-usbin/freebsd-usbin-9.9999.ebuild | 10 +- 32 files changed, 227 insertions(+), 255 deletions(-) diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest index 9767a59..451d622 100644 --- a/sys-freebsd/boot0/Manifest +++ b/sys-freebsd/boot0/Manifest @@ -1,3 +1,2 @@ AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1 -EBUILD boot0-9.2.9999_p253912.ebuild 1500 SHA256 64f4fadc14e2d87dd9506d95c8ae7dc8838013d2ad5d6d7d1828cbe234f52cc8 SHA512 7bbd96e3c793ac869d8c266a1cb9c4e6faa08c5ad6921318ea6f16ab6f67dffc8ef114d76b4b094ad6ed069163f63c31a3dc856698cf305a14c920002e1c7773 WHIRLPOOL 3cf114b3940fb2780400eb86d9bdf5f46b1370e132dd402de1564e7eab8550f54ef1223c786db7312483faa157510730230567add84219f57d141c215e8812e6 EBUILD boot0-9.9999.ebuild 1500 SHA256 64f4fadc14e2d87dd9506d95c8ae7dc8838013d2ad5d6d7d1828cbe234f52cc8 SHA512 7bbd96e3c793ac869d8c266a1cb9c4e6faa08c5ad6921318ea6f16ab6f67dffc8ef114d76b4b094ad6ed069163f63c31a3dc856698cf305a14c920002e1c7773 WHIRLPOOL 3cf114b3940fb2780400eb86d9bdf5f46b1370e132dd402de1564e7eab8550f54ef1223c786db7312483faa157510730230567add84219f57d141c215e8812e6 diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest index a12b3cf..3f48ba4 100644 --- a/sys-freebsd/freebsd-bin/Manifest +++ b/sys-freebsd/freebsd-bin/Manifest @@ -1,2 +1 @@ -EBUILD freebsd-bin-9.2.9999_p253912.ebuild 879 SHA256 a3bc995ee0a9ca06d56e68a9096912065956a4974b18a8e04b19cc0ca17dacef SHA512 9ccb036fa7d24557007eb855cbbc073da30abb5a9d2cfda384ad2afd9e12a6afd17d2693830ab469406c799a9685988f0bdb695a9b985770075dbe5c3e216e43 WHIRLPOOL 51f96789f4445cfaa15980cd9d12750b7d84264ca171e5af1a0a8825d380af8a7fa84b78efa814caedcd19856f00509711d002fac150c14b0cd28f8714ff91d8 EBUILD freebsd-bin-9.9999.ebuild 879 SHA256 a3bc995ee0a9ca06d56e68a9096912065956a4974b18a8e04b19cc0ca17dacef SHA512 9ccb036fa7d24557007eb855cbbc073da30abb5a9d2cfda384ad2afd9e12a6afd17d2693830ab469406c799a9685988f0bdb695a9b985770075dbe5c3e216e43 WHIRLPOOL 51f96789f4445cfaa15980cd9d12750b7d84264ca171e5af1a0a8825d380af8a7fa84b78efa814caedcd19856f00509711d002fac150c14b0cd28f8714ff91d8 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 diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest index cfa58c1..8eca430 100644 --- a/sys-freebsd/freebsd-contrib/Manifest +++ b/sys-freebsd/freebsd-contrib/Manifest @@ -1,2 +1 @@ -EBUILD freebsd-contrib-9.2.9999_p253912.ebuild 1517 SHA256 5338b302969099791c602105c35693172654022b46f7a042ca48eb5b2aafcdf3 SHA512 2c2c29445b8f997a32886baa25ef568295671855a64bab9c28b56821364b343fa5244ac91ae52394fa3147c0488a917420b596c5a8582ddbf3b4aca670280c84 WHIRLPOOL b86193209b9e2f2a9b3f5299c5e85c24fb287c954fd8692ff25adf6cab9838cb49b3f838ef1b6913297766169bac59867ac4773bd8b1e6bd7fecf257412e60d0 -EBUILD freebsd-contrib-9.9999.ebuild 1517 SHA256 5338b302969099791c602105c35693172654022b46f7a042ca48eb5b2aafcdf3 SHA512 2c2c29445b8f997a32886baa25ef568295671855a64bab9c28b56821364b343fa5244ac91ae52394fa3147c0488a917420b596c5a8582ddbf3b4aca670280c84 WHIRLPOOL b86193209b9e2f2a9b3f5299c5e85c24fb287c954fd8692ff25adf6cab9838cb49b3f838ef1b6913297766169bac59867ac4773bd8b1e6bd7fecf257412e60d0 +EBUILD freebsd-contrib-9.9999.ebuild 1092 SHA256 90a4e905a49f318d4be556e9671d6e535d941acfd116b9dfdedab16cd9cdef6b SHA512 d3b5e836fc4ec43938480256f011f74b44ee55f995ef0ebfd10be5c67c81b2bea365c1a1a8899cca387b19c4c847a80f5877200d41c02dc7274a4f4d386d57c7 WHIRLPOOL 358b2e4fcffee717801135da32e48bd58595a439b78de69739b7c696e46bc207a52e998a7f34cbedd41297bdc33f80ba3ff0100deaa0d8cb1133d8ea28685346 diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild index 1870e92..aefd6e2 100644 --- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild +++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild @@ -20,20 +20,6 @@ DEPEND="=sys-freebsd/freebsd-sources-${RV}* S="${WORKDIR}/gnu" -src_unpack() { - if [[ ${PV} == *9999* ]]; then - freebsd_src_unpack - else - echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}" - tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libodialog gnu/usr.bin/sort gnu/usr.bin/patch - echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}" - tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort - - freebsd_do_patches - freebsd_rename_libraries - fi -} - src_compile() { cd "${S}/lib/libodialog" freebsd_src_compile diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index fac2a73..492ca19 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -12,13 +12,11 @@ AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414 -AUX freebsd-lib-9.2-flex.patch 397 SHA256 0beba174e1946bf9a5e703443acd33eb95c9df12d33515cd734746dd13b9fb38 SHA512 9fe3854e35ee8ce11f8a150297eb2e1e7d1d0de9a809023aa6d86e12110124bca01ee0040df91e4af5f0bc671d9570719687044bceaf25633fe4771801f54112 WHIRLPOOL 2a628aa4c5ecd90e6706da1ecb290925bba088ba1f865f8c3de51cce3955d5826681481a0a5bb1bc270f64dd00a085e0dba530ae9cd6bb77df292ddb24b8dc8d -AUX freebsd-lib-9.2-telnet.h.patch 497 SHA256 46e9ef90213e61e0dc31897a89d5103cce76ac7dbc51888a38fb144f94a35af8 SHA512 537df980f8675d72ed8ad872f382bf9c7bc1bbe3efe5e3d8e5e175feb45ed40dbc115d6b11983fa66abdd33e3c7fefa31c2f736db82ef1d2c81dc0a633e8855a WHIRLPOOL bb9353449455eb93ee4ac0584732110913daefe9c56d1372aaad6c5a3f9ba65f32fef236f1d1491982a21541f0ff7ebaf9dde6e7d36f269938206133a992939d +AUX freebsd-lib-9.2-liblink.patch 1420 SHA256 c8fa4315a89d3acc378c89ecd778a43ab5b4824783ef19af1082732f6b2dc3a4 SHA512 88e564e13399c88eb238a10bea1a4959c62a6af6d3c9c41c331878e0c6a1680767ebdb58f555a9f1145a2c47cdfc65e3f98387947f1941327b800cb18983cda4 WHIRLPOOL b6f2654138e9e46b0fe193b1488150e4f84c5f1b14ab1a8f21348a4158570f99499e94c54acaf8244fc1d2cc0775a40c77585b88387cf2a73ed33062335c5255 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8 -EBUILD freebsd-lib-9.2.9999_p253912.ebuild 18897 SHA256 2526acec475fee972719ea4a376b0a7e59ff213def64a8b4b7ac14f7187e5936 SHA512 c9c8d0f131ba3dfdad698a394525d5d9a15750db483a56c8f81f7af0de9efc6cfe9e53f9cf9582424494d8b20badf1e3a28cccd5c9ed35eb9b8ed5ae6aa23fb1 WHIRLPOOL 95afafdfe9643eb4705adc5ab4554903366e94245d32f953d54d734af92f3fcaf715706fb880aabbca4a55403cc7d6e860908fe48be3e6d5787a223ce6844252 -EBUILD freebsd-lib-9.9999.ebuild 18897 SHA256 2526acec475fee972719ea4a376b0a7e59ff213def64a8b4b7ac14f7187e5936 SHA512 c9c8d0f131ba3dfdad698a394525d5d9a15750db483a56c8f81f7af0de9efc6cfe9e53f9cf9582424494d8b20badf1e3a28cccd5c9ed35eb9b8ed5ae6aa23fb1 WHIRLPOOL 95afafdfe9643eb4705adc5ab4554903366e94245d32f953d54d734af92f3fcaf715706fb880aabbca4a55403cc7d6e860908fe48be3e6d5787a223ce6844252 +EBUILD freebsd-lib-9.9999.ebuild 18159 SHA256 ddd0673a0389e96389294951bcf847304f02dbdc62539f0b8f1636f3d83381f5 SHA512 5b6366c03d8b5e0053f518d72005844a276b45a871d9373d9e258684ad2aec1e37f094abc11461735d11c57714fd441c30c0e29f528e6c73e4f147c13d6659f9 WHIRLPOOL 388a625048570de077df71edd2ef6ac434c04fa39be01c7660c189e44d841790ea364d8f9e8bacd2600665208b485fe188a5bf5f83d7051b793e79805d8e567c diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-flex.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-flex.patch deleted file mode 100644 index eb4d066..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-flex.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l -index 219cce4..a5d3c03 100644 ---- a/lib/libipsec/policy_token.l -+++ b/lib/libipsec/policy_token.l -@@ -139,8 +139,6 @@ void - __policy__strbuffer__init__(msg) - char *msg; - { -- if (YY_CURRENT_BUFFER) -- yy_delete_buffer(YY_CURRENT_BUFFER); - strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg); - yy_switch_to_buffer(strbuffer); - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch new file mode 100644 index 0000000..cfc7181 --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch @@ -0,0 +1,55 @@ +diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile +index 87ce8d4..77d0535 100644 +--- a/lib/libdwarf/Makefile ++++ b/lib/libdwarf/Makefile +@@ -21,6 +21,7 @@ SRCS= \ + INCS= dwarf.h libdwarf.h + + CFLAGS+= -I${.CURDIR} ++CFLAGS+= -I${.CURDIR}/../libelf + + SHLIB_MAJOR= 3 + +diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile +index e20e00a..77d46d7 100644 +--- a/lib/libproc/Makefile ++++ b/lib/libproc/Makefile +@@ -12,9 +12,13 @@ SRCS= proc_bkpt.c \ + INCS= libproc.h + + CFLAGS+= -I${.CURDIR} ++CFLAGS+= -I${.CURDIR}/../libelf + + SHLIB_MAJOR= 2 + + WITHOUT_MAN= + ++LDADD+= -lelf ++LDFLAGS+= -L${.OBJDIR}/../libelf ++ + .include +diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile +index 783fb8b..62e7c60 100644 +--- a/lib/librtld_db/Makefile ++++ b/lib/librtld_db/Makefile +@@ -10,5 +10,8 @@ SRCS= rtld_db.c + INCS= rtld_db.h + + CFLAGS+= -I${.CURDIR} ++CFLAGS+= -I${.CURDIR}/../libelf ++LDADD+= -lutil -lproc ++LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc + + .include +diff -uNr lib.old/libprocstat/Makefile lib/libprocstat/Makefile +--- a/lib/libprocstat/Makefile 2013-08-11 16:00:47.000000000 -0400 ++++ b/lib/libprocstat/Makefile 2013-08-11 16:18:19.000000000 -0400 +@@ -17,6 +17,8 @@ + SYMBOL_MAPS= ${.CURDIR}/Symbol.map + + INCS= libprocstat.h ++CFLAGS+= -I${.CURDIR}/../libelf ++LDFLAGS+= -L${.OBJDIR}/../libelf + CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE + SHLIB_MAJOR= 1 + diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-telnet.h.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-telnet.h.patch deleted file mode 100644 index 7a08f13..0000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-telnet.h.patch +++ /dev/null @@ -1,20 +0,0 @@ -freebsd-{rescue,usbin}-9.9999 needs /usr/include/arpa/telnet.h - -diff --git a/include/arpa/Makefile b/include/arpa/Makefile -index 8a7f63d..a480b31 100644 ---- a/include/arpa/Makefile -+++ b/include/arpa/Makefile -@@ -1,12 +1,7 @@ - # $FreeBSD$ - --.include -- - NO_OBJ= --INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h --.if ${MK_TELNET} == "no" --INCS+= telnet.h --.endif -+INCS= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h - INCSDIR=${INCLUDEDIR}/arpa - - .include diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild index f9f33aa..49c05d0 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild +inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build DESCRIPTION="FreeBSD's base system libraries" SLOT="0" @@ -22,10 +22,8 @@ if [[ ${PV} != *9999* ]]; then mirror://gentoo/${INCLUDE}.tar.bz2 mirror://gentoo/${USBIN}.tar.bz2 mirror://gentoo/${GNU}.tar.bz2 - build? ( - mirror://gentoo/${SYS}.tar.bz2 ) - zfs? ( - mirror://gentoo/${CDDL}.tar.bz2 )" + build? ( mirror://gentoo/${SYS}.tar.bz2 ) + zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )" fi if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then @@ -36,6 +34,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) >=dev-libs/expat-2.0.1 !sys-libs/libutempter + !dev-libs/libelf !sys-freebsd/freebsd-headers" DEPEND="${RDEPEND} >=sys-devel/flex-2.5.31-r2 @@ -58,7 +57,7 @@ fi IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware build crosscompile_opts_headers-only zfs - userland_GNU userland_BSD multilib" + userland_GNU userland_BSD" pkg_setup() { [ -c /dev/zero ] || \ @@ -78,7 +77,7 @@ pkg_setup() { use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS=" + mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= " if [ "${CTARGET}" != "${CHOST}" ]; then mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" @@ -89,12 +88,12 @@ pkg_setup() { PATCHES=( "${FILESDIR}/${PN}-6.0-pmc.patch" "${FILESDIR}/${PN}-6.1-csu.patch" - "${FILESDIR}/${PN}-9.0-liblink.patch" - "${FILESDIR}/${PN}-9.0-bluetooth.patch" + "${FILESDIR}/${PN}-9.2-liblink.patch" + "${FILESDIR}/${PN}-bsdxml2expat.patch" "${FILESDIR}/${PN}-9.0-netware.patch" + "${FILESDIR}/${PN}-9.0-bluetooth.patch" "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch" - "${FILESDIR}/${PN}-9.2-flex.patch" - "${FILESDIR}/${PN}-bsdxml2expat.patch" ) + ) # Here we disable and remove source which we don't need or want # In order: @@ -108,27 +107,17 @@ PATCHES=( # # The rest are libraries we already have somewhere else because # they are contribution. -# Note: libtelnet is an internal lib used by telnet and telnetd programs -# as it's not used in freebsd-lib package itself, it's pointless building -# it here. REMOVE_SUBDIRS="ncurses \ libexpat \ libz libbz2 libarchive liblzma \ libsm libsmdb libsmutil \ libbegemot libbsnmp \ libpam libpcap bind libwrap libmagic \ - libcom_err libtelnet - libelf libedit + libcom_err + libedit libstand libgssapi" -# For doing multilib over multibuild.eclass -if use multilib ; then - MULTIBUILD_VARIANTS=( $(get_all_abis) ) -else - MULTIBUILD_VARIANTS=${DEFAULT_ABI} -fi - # Are we building a cross-compiler? is_crosscompile() { [ "${CATEGORY#*cross-}" != "${CATEGORY}" ] @@ -158,7 +147,6 @@ src_prepare() { epatch "${FILESDIR}/${PN}-8.0-gcc45.patch" epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch" epatch "${FILESDIR}/${PN}-9.1-rmgssapi.patch" - epatch "${FILESDIR}/${PN}-9.2-telnet.h.patch" # Don't install the hesiod man page or header rm "${WORKDIR}"/include/hesiod.h || die @@ -186,7 +174,7 @@ src_prepare() { fi if ! is_crosscompile ; then - ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" + ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" else sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \ "${S}/libc/rpc/Makefile.inc" \ @@ -205,6 +193,14 @@ src_prepare() { fi } +bootstrap_lib() { + for i ; do + cd "${WORKDIR}/${i}" || die "missing ${i}" + freebsd_src_compile + append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}" + done +} + get_csudir() { if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then echo "lib/csu/$1-elf" @@ -216,14 +212,13 @@ get_csudir() { bootstrap_csu() { local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))" export RAW_LDFLAGS=$(raw-ldflags) - cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}." - freebsd_src_compile + bootstrap_lib "${csudir}" CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" - cd "${WORKDIR}/gnu/lib/csu" || die - freebsd_src_compile + bootstrap_lib "gnu/lib/csu" + cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" for i in *.So ; do ln -s $i ${i%.So}S.o @@ -234,36 +229,20 @@ bootstrap_csu() { # Compile libssp_nonshared.a and add it's path to LDFLAGS. bootstrap_libssp_nonshared() { - cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp." - freebsd_src_compile - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" + bootstrap_lib "gnu/lib/libssp/libssp_nonshared" export LDADD="-lssp_nonshared" } -bootstrap_libc() { - cd "${WORKDIR}/lib/libc" || die - freebsd_src_compile - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc" -} - bootstrap_libgcc() { - cd "${WORKDIR}/lib/libcompiler_rt" || die - freebsd_src_compile + bootstrap_lib "lib/libcompiler_rt" cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die ln -s libcompiler_rt.a libgcc.a || die - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" - - bootstrap_libc - cd "${WORKDIR}/gnu/lib/libgcc" || die - freebsd_src_compile - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libgcc" + bootstrap_lib "lib/libc" "gnu/lib/libgcc" } bootstrap_libthr() { - cd "${WORKDIR}/lib/libthr" || die - freebsd_src_compile - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" + bootstrap_lib "lib/libthr" cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die ln -s libthr.so libpthread.so } @@ -273,7 +252,7 @@ bootstrap_libthr() { CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt" # What to build for non-default ABIs. -NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt" +NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf" # Subdirs for a native build: NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc" @@ -281,13 +260,12 @@ NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu # Is my $ABI native ? is_native_abi() { is_crosscompile && return 1 - use multilib || return 0 - [ "${ABI}" = "${DEFAULT_ABI}" ] + multilib_is_native_abi } # Do we need to bootstrap the csu and libssp_nonshared? need_bootstrap() { - is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' ; } || has_version "<${CATEGORY}/${P}" || [[ ${PV} == *9999* ]] + is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}" } # Get the subdirs we are building. @@ -326,9 +304,10 @@ do_bootstrap() { fi bootstrap_csu bootstrap_libssp_nonshared - is_crosscompile && bootstrap_libc + is_crosscompile && bootstrap_lib "lib/libc" is_crosscompile || is_native_abi || bootstrap_libgcc is_native_abi || bootstrap_libthr + is_native_abi || bootstrap_lib "lib/libsbuf" } # Compile it. Assume we have the toolchain setup correctly. @@ -359,12 +338,7 @@ src_compile() { unalias sed fi - # Support for upgrade from a previous version. - # If install command does not support -l option, this is necessary. - if is_crosscompile || has_version ' "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die + sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die fi - if use multilib ; then + # Generate ldscripts for core libraries that will go in / + multilib_is_native_abi && \ + gen_usr_ldscript -a alias cam geom ipsec jail kiconv \ + kvm m md procstat sbuf thr ufs util elf + + if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then cd "${D}/usr/include" for i in machine/*.h fenv.h ; do move_header ${i} done - if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then + if multilib_is_native_abi ; then # Supposedly the last one! local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')" for j in ${uniq_headers} ; do @@ -555,6 +544,7 @@ src_install() { return 0 else export STRIP_MASK="*/usr/lib*/*crt*.o" + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install fi @@ -565,17 +555,6 @@ src_install() { # Install ttys file local MACHINE="$(tc-arch-kernel)" doins "etc.${MACHINE}"/* - - # Generate ldscripts for core libraries that will go in / - gen_usr_ldscript -a alias cam geom ipsec jail kiconv \ - kvm m md procstat sbuf thr ufs util - - # Install a libusb.pc for better compat with Linux's libusb - if use usb ; then - dodir /usr/$(get_libdir)/pkgconfig - sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die - sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die - fi } install_includes() diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest index d44fcad..37089d1 100644 --- a/sys-freebsd/freebsd-libexec/Manifest +++ b/sys-freebsd/freebsd-libexec/Manifest @@ -5,5 +5,4 @@ AUX rstatd.xinetd 218 SHA256 7bf526babdd46f03a6ea9ed12b5df16e5c2abc8aeb567214c8e AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e99181408067a49cd3 SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd WHIRLPOOL 7517089e5ab5b3925b46908c22a929cb04c8390387ad075f17c2fa0213ab38cae833d9280cfe289915afe4c2ee0b3e0299cee42daa871c23507f5f96cc22f227 AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802 -EBUILD freebsd-libexec-9.2.9999_p253912.ebuild 2348 SHA256 993320130ecf3028644e4c3332a6a352e3e64b2e23f5f79f4a5b882bc32a3264 SHA512 7302b4f1b328d6af43db6f4f44d1bb5d20e3ed7c9ba80487cbabe3789a5403b442c6ca36880947fc53607f20fbaaa977e0f4d5fcc03b8a1586a9422315ea62bc WHIRLPOOL d779dbde3a4a079695e40ef4c3ca97b7d35508812b81e4eec2643e06328ab60e631032ee1f3b23f1af0a4148127173166119104b12cc3bb75396dc74e641d66b -EBUILD freebsd-libexec-9.9999.ebuild 2348 SHA256 993320130ecf3028644e4c3332a6a352e3e64b2e23f5f79f4a5b882bc32a3264 SHA512 7302b4f1b328d6af43db6f4f44d1bb5d20e3ed7c9ba80487cbabe3789a5403b442c6ca36880947fc53607f20fbaaa977e0f4d5fcc03b8a1586a9422315ea62bc WHIRLPOOL d779dbde3a4a079695e40ef4c3ca97b7d35508812b81e4eec2643e06328ab60e631032ee1f3b23f1af0a4148127173166119104b12cc3bb75396dc74e641d66b +EBUILD freebsd-libexec-9.9999.ebuild 2351 SHA256 5770dc78de146e03ea34f20cd2cc3c4135dfb4c0398048689e0488dec8d50741 SHA512 69e3729cdc4862c471308f015a7f08868112de149f86305b345cc268ed28c97a4e15a3c76926eb6850a82be81cd4f41c98becd6bbef2416b04337598e68073ec WHIRLPOOL 430cdb560171d20fe69d747484fb79c718abc5943a1c139a6c8cee9cf9766394d74cf05c55a52222c127521f30cfbc8f5192ddaa6c847feaea9def77b08576f9 diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild index b661e78..a9bd36b 100644 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild +++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit bsdmk freebsd pam multilib multibuild +inherit bsdmk freebsd pam multilib multibuild multilib-build DESCRIPTION="FreeBSD libexec things" SLOT="0" @@ -21,7 +21,7 @@ if [[ ${PV} != *9999* ]]; then fi RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - >=sys-freebsd/freebsd-lib-9.1-r6[multilib?] + >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}] pam? ( virtual/pam )" DEPEND="${RDEPEND} =sys-freebsd/freebsd-mk-defs-${RV}* @@ -34,13 +34,7 @@ S="${WORKDIR}/libexec" # Remove sendmail, tcp_wrapper and other useless stuff REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd" -IUSE="pam ssl kerberos ipv6 multilib nis xinetd" - -if use multilib ; then - MULTIBUILD_VARIANTS=( $(get_all_abis) ) -else - MULTIBUILD_VARIANTS=${DEFAULT_ABI} -fi +IUSE="pam ssl kerberos ipv6 nis xinetd" pkg_setup() { use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " @@ -57,7 +51,7 @@ src_prepare() { } setup_multilib_vars() { - if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then + if ! multilib_is_native_abi ; then cd "${WORKDIR}/libexec/rtld-elf" || die export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1" else @@ -67,10 +61,12 @@ setup_multilib_vars() { } src_compile() { + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile } src_install() { + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install insinto /etc diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index fb816a1..ca00220 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -4,5 +4,4 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6 AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362 -EBUILD freebsd-mk-defs-9.2.9999_p253912.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3 EBUILD freebsd-mk-defs-9.9999.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3 diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest index 50b21ee..ff0269a 100644 --- a/sys-freebsd/freebsd-pam-modules/Manifest +++ b/sys-freebsd/freebsd-pam-modules/Manifest @@ -1,4 +1,3 @@ AUX README.pamd 2965 SHA256 2d3cea2b59ddee2ca6639ca7d14068e1499acee4194181c255bdfea81964d5ac SHA512 e278fd0a5056ae8c1de2f6104bfb4766adc89c7c357a4b965cb08ee555a071b326462c937fd63cd8fc7bd7e2a880f939cecdf2997a3d2c33c1b962afee12d38e WHIRLPOOL 8ee79582595a2b79f3936863bd5fdb144930380a4073a74ec81967b3a11d61a40ca0becaf36dfa760c0c6110efa2041a4acd6041615e0d006f032e1d9c819aff AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7 -EBUILD freebsd-pam-modules-9.2.9999_p253912.ebuild 1121 SHA256 342ee8740aeff932961270c4ac571da1cc80c687ad894907b828cbd16317df97 SHA512 d73437cb20e20ad658cadfc371d28305160371243e190b053fe0732964e504991e78b77c88e3a9f98332034cb4e8d0b18ad64b9f0a9a28bc7f7d20e9ee1360ad WHIRLPOOL 66a06e999cab8874398753262d0fee0d4afc01fe010d8655a1e96bf7949c889452ef73dab46c605532d16f95165158f74a93a8be840284bdd7df1076752d9432 EBUILD freebsd-pam-modules-9.9999.ebuild 1121 SHA256 342ee8740aeff932961270c4ac571da1cc80c687ad894907b828cbd16317df97 SHA512 d73437cb20e20ad658cadfc371d28305160371243e190b053fe0732964e504991e78b77c88e3a9f98332034cb4e8d0b18ad64b9f0a9a28bc7f7d20e9ee1360ad WHIRLPOOL 66a06e999cab8874398753262d0fee0d4afc01fe010d8655a1e96bf7949c889452ef73dab46c605532d16f95165158f74a93a8be840284bdd7df1076752d9432 diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest index 6072c91..93e72a6 100644 --- a/sys-freebsd/freebsd-pf/Manifest +++ b/sys-freebsd/freebsd-pf/Manifest @@ -5,5 +5,4 @@ AUX freebsd-pf-9.0-pcap_pollution.patch 450 SHA256 d6ec6b1952e22f621b33d85956837 AUX freebsd-pf-9.0-pflogd.patch 332 SHA256 fc832fdfa406603a2cb185b8f0f746b13f7673742578913ba635849e1fd778f6 SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073 WHIRLPOOL b90b5e454e96cc6f243e99358b78d45b6a13a46810a3683d837f03721052e7b4fc3f8733ac2c96cabed204435a9be93a0652da5311f6552ece294031b0b663df AUX pf.confd 274 SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5 WHIRLPOOL fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc AUX pf.initd 916 SHA256 b0cf7dadb825a1133fb52069e63eda10042aa62e3fa702bfbee53cd455837ac9 SHA512 cd55eccc9735f5a9e41297049a12c23b3fb4ef0987236b25bbfeeb01e7e0be697ff60fe8c9827dbb6a3da93211d6534e018a9693a6d1d48d60723738a21e7485 WHIRLPOOL babaa4fdcb885262ec9e89b9bd076aa4fec0c82764025d3192dda6986366b2f0169235c4c771510ea742444deb0c7bccf56f4ab23fb592351decae445b9cc158 -EBUILD freebsd-pf-9.2.9999_p253912.ebuild 1666 SHA256 22f38a04fbaa298ad0d7547507131f36b7fbab5e5e0eaf8b01598a8a06985ca0 SHA512 56adcb11151ab3e6ee34e1bb74674aa02aeeac0f871adc070203142eaa780a81f96ec16d2a1128cb54489cf8d57f335512291d4b4b873ce2c01471964a1db454 WHIRLPOOL 16d776b9251c4f7fa9a05c3d65548b2acdae163c1ae5c53705d892793987aba974254da344637b93bc291649641261a5d97d8a80f8c8837fe98280940eb42777 -EBUILD freebsd-pf-9.9999.ebuild 1666 SHA256 22f38a04fbaa298ad0d7547507131f36b7fbab5e5e0eaf8b01598a8a06985ca0 SHA512 56adcb11151ab3e6ee34e1bb74674aa02aeeac0f871adc070203142eaa780a81f96ec16d2a1128cb54489cf8d57f335512291d4b4b873ce2c01471964a1db454 WHIRLPOOL 16d776b9251c4f7fa9a05c3d65548b2acdae163c1ae5c53705d892793987aba974254da344637b93bc291649641261a5d97d8a80f8c8837fe98280940eb42777 +EBUILD freebsd-pf-9.9999.ebuild 1660 SHA256 2e8dd5c31676c4498781875b04e8313b3f4191b39443b48f297d87842c77fa1e SHA512 9d88cad67a8a5f2b3919ed91fd341e629bf760384ac81b83d962578ebbab848168834573ac504182e6076f34ff230933d82912f4d641218ca35155abf59dece0 WHIRLPOOL c4f5ff956d40286fc03b14f32452f4c02efdaf80d5cbeffde30a280e97864c3447c144de2464fc82702bdd6a50d4bb3addd7cf795e6244e26b2467911c45dc2e diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild index 71cf3d2..f0e2cc4 100644 --- a/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild +++ b/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild @@ -43,7 +43,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-9.0-bpf.patch" epatch "${FILESDIR}/${PN}-9.0-getline.patch" # Link in kernel sources - ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + ln -s "/usr/src/sys" "${WORKDIR}/sys" } src_compile() { diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest index d3e37a7..d318135 100644 --- a/sys-freebsd/freebsd-rescue/Manifest +++ b/sys-freebsd/freebsd-rescue/Manifest @@ -3,7 +3,5 @@ AUX freebsd-rescue-8.0-pkgconfig_static_libarchive.patch 330 SHA256 3690730ee660 AUX freebsd-rescue-8.2-libzcleverlink.patch 789 SHA256 80d86cb1b632d0c09fdcfd7b998fb1189e957619a41fc65682e2c439392c38fd SHA512 5c24aed5b05b1de4aad67961edbc168c31f80a2d0d034839af8b2fb73497b34d525e1af2c0979b1e23bbcbb53d6079030aa68a1b218cef470c8daa2f439d3a7f WHIRLPOOL 55b39e959f0d0821189070ca03167becdd6d446a97dff7c171c40b12629cb2365aed6633635e6d8f6e3f3fa6bea68c46f31b79e537c3d56752e4aee76d76ce84 AUX freebsd-rescue-9.1-bsdtar.patch 404 SHA256 0e71e3e370b33318bbb167e82d6507589fb95cc2c2d1fc6e8b74d0faf3d17ef1 SHA512 320d2a69c2f0de5e6cb733238fcc46133e571d8536f2ac573597f008d4261fae4d27619c244a90a70392688004df438b80e89f6be810841f6a40a22c2c361bb4 WHIRLPOOL 412da27f4535e1300d150edc74f72cf5e4e2b8bb6d4c7e9f31a498396ac12514e97e4b3a83040484b4713a7edb6b2d6ed5e8b2fe714d13f297c35d657f90fc08 AUX freebsd-rescue-9.1-libcleverlink.patch 801 SHA256 53794263aabaf55cd570adbbfdb68e86a9e9b17557e8ca223d424a5c2f4f6831 SHA512 556bb68f3307dc7fb10096080db2d336ba4096ba6bebc6a1fe9449ab5298ce2c66fb53f11f0702ee75c2208b45a6e2cb366a3d774bedb65bcdb2a49f51c08fa3 WHIRLPOOL 88125b9143113b1f7049bf63a20a0c6d82fbe2c722198405830092b0a183f4bf7744420e6a82b601c8fb25911556c8f3a9088949798c7f66caf7843a5f9b2347 -AUX freebsd-rescue-9.2-pkgconfig_static_libarchive.patch 450 SHA256 bb3920094b51d90f8c276a8376e6d386195527c1259aefc49dcc7dbaaced7c7e SHA512 e23c1e009ae9c3ec3a1ae221229d591aced150668bfb4038af65fab605ff1ff6dfe06fb6c63f02d3630ff6c89c3540eb37c763f08f324d49629d07878c083879 WHIRLPOOL 855a9faaf1fd70a3c6d233ac2b54e68632e1ce87a185d4676dabb3110cde975b4680988fba5075709f5911e12a38335f3d4d44ce7147bdbc083023674fd1fd4c AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b -EBUILD freebsd-rescue-9.2.9999_p253912.ebuild 2015 SHA256 797d2da61fd79060dce98c2be5ad369596bc2ff83254cf0a98f67f9f6356dd42 SHA512 a1afd6df8debe1bcec6b8a0cbf9801d341e727c19fa58f5a7a1614fc43ed51149300139c98f795bb2310e6ff0791434376a1485a3c740ee9cf90610f2f6b1bac WHIRLPOOL 911522a7d855b3082b406a9d7af27f7dfd3be964fd0b161593cd697d9853ec547025d304511f33be07b7c323bb4ea0fcd1def5b6f11cbec9bf09eb03265a110e -EBUILD freebsd-rescue-9.9999.ebuild 2015 SHA256 797d2da61fd79060dce98c2be5ad369596bc2ff83254cf0a98f67f9f6356dd42 SHA512 a1afd6df8debe1bcec6b8a0cbf9801d341e727c19fa58f5a7a1614fc43ed51149300139c98f795bb2310e6ff0791434376a1485a3c740ee9cf90610f2f6b1bac WHIRLPOOL 911522a7d855b3082b406a9d7af27f7dfd3be964fd0b161593cd697d9853ec547025d304511f33be07b7c323bb4ea0fcd1def5b6f11cbec9bf09eb03265a110e +EBUILD freebsd-rescue-9.9999.ebuild 2007 SHA256 49832427041ca0c26cdc71bdda85acac7c6f94486511bd29ce51807c28d4529c SHA512 5638b5a64e9a710cdc051a243db2ef7d03895f2c11dfb68b09eab5506a3d2112d51f99f96f2c47ea287afb8fedcaea36b22d3b373a1b6ce6f979d2dd2fe1a0d1 WHIRLPOOL 89225e2bf70cbf8f65248cad5f69f4682d707448177e777253014d748ebe11a38f37294775a6006f85b671395b59020f0b169a7f46038bf37dd0df466e6d0786 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.2-pkgconfig_static_libarchive.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.2-pkgconfig_static_libarchive.patch deleted file mode 100644 index 002429c..0000000 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.2-pkgconfig_static_libarchive.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur rescue.orig/rescue/Makefile rescue/rescue/Makefile ---- rescue.orig/rescue/Makefile 2013-01-29 00:00:47.000000000 +0900 -+++ rescue/rescue/Makefile 2013-01-29 00:09:33.000000000 +0900 -@@ -195,7 +195,7 @@ - CRUNCH_LIBS+= -llzma - - CRUNCH_PROGS_usr.bin+= tar --CRUNCH_LIBS+= -larchive -lmd -+CRUNCH_LIBS+= `pkg-config --static --libs libarchive | sed 's:-lz -lxml2 -lz:-lxml2 -lz:'` -lmd - .if ${MK_OPENSSL} != "no" - CRUNCH_LIBS+= -lcrypto - .endif diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.9999.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.9999.ebuild index f2b29f1..a01fb54 100644 --- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.9999.ebuild +++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.9999.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=2 +EAPI=5 -inherit bsdmk freebsd +inherit bsdmk freebsd toolchain-funcs DESCRIPTION="FreeBSD's rescue binaries" SLOT="0" @@ -29,7 +29,6 @@ fi RDEPEND="" DEPEND="sys-devel/flex - >=app-arch/libarchive-3.0.3[static-libs] app-arch/xz-utils[static-libs] sys-libs/ncurses[static-libs] dev-libs/expat[static-libs] @@ -39,13 +38,11 @@ DEPEND="sys-devel/flex dev-libs/openssl[static-libs] sys-libs/zlib[static-libs] sys-libs/readline[static-libs] - virtual/pkgconfig =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?] =sys-freebsd/freebsd-sources-${RV}* =sys-freebsd/freebsd-mk-defs-${RV}* zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )" - S="${WORKDIR}/rescue" pkg_setup() { @@ -53,22 +50,27 @@ pkg_setup() { use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= " use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " + mymakeopts="${mymakeopts} NO_PIC= " } src_prepare() { # As they are patches from ${WORKDIR} apply them by hand cd "${WORKDIR}" - epatch "${FILESDIR}/${PN}"-9.2-pkgconfig_static_libarchive.patch epatch "${FILESDIR}/${PN}"-7.1-zlib.patch - epatch "${FILESDIR}/${PN}"-9.1-libcleverlink.patch - epatch "${FILESDIR}/${PN}"-9.1-bsdtar.patch epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch" } src_compile() { + tc-export CC # crunchgen is now checks env MAKE. # Use to force BSD's make export MAKE=/usr/bin/make + cd "${WORKDIR}/lib/libarchive" + echo "#include " > bsdxml.h + freebsd_src_compile + export CC="${CC} -L${WORKDIR}/lib/libarchive" + + cd "${S}" freebsd_src_compile } diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest index 235473f..03f5d82 100644 --- a/sys-freebsd/freebsd-sbin/Manifest +++ b/sys-freebsd/freebsd-sbin/Manifest @@ -5,5 +5,4 @@ AUX freebsd-sbin-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4 AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b AUX freebsd-sbin-setXid.patch 541 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 SHA512 e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e WHIRLPOOL a2d578ff3b54ad25875f65d6724d0762c0fc3a400aa8e14c93ab94dc789910fbc6ab70528cbd0074fd0d7a4957a2d2d51bf10f615cbfd751aa4e95edc88d4e7d AUX idmapd.initd 440 SHA256 e89050097731f658825b4a7215023e1c5070f0e31cfdf79eaf299ede9c9f9e39 SHA512 d76f1ed5b6cb0624359f0e1018b1decee80fec6e201393500656a2001034b042dde4299c2768ea8bfd1aa65813c86a5f9c06b5dd2e41ab74f954b8310d55259a WHIRLPOOL eeb04173b61c7e60883bd51e07be5f69aa67d6f4e506c3b3e07604e86cb43d81b5722e23e21ec189d83f2549a8827256216f45025ea5fd427b4874f2723c7a16 -EBUILD freebsd-sbin-9.2.9999_p253912.ebuild 2692 SHA256 c3ccfc7220e7d0708bb8f7b9f718af837a7eb46e81666545f97f4a01a64cf143 SHA512 087a5a66aff4da1cde6981d2daec9bde12406067d0465c444dea9d67d8e77b90bbc0cbc1724b108baa0640ebee4445269f8fef459ba139e7f949e9d51c7cda41 WHIRLPOOL 5475c4cdfbc5c5b7bc03acf3b2a249cd8810a34b9ae27d3c7f22f1d870df942b3e4c21037075f65efa1aa127924b13211275e2361fdac4d26a96768e52ab4194 -EBUILD freebsd-sbin-9.9999.ebuild 2692 SHA256 c3ccfc7220e7d0708bb8f7b9f718af837a7eb46e81666545f97f4a01a64cf143 SHA512 087a5a66aff4da1cde6981d2daec9bde12406067d0465c444dea9d67d8e77b90bbc0cbc1724b108baa0640ebee4445269f8fef459ba139e7f949e9d51c7cda41 WHIRLPOOL 5475c4cdfbc5c5b7bc03acf3b2a249cd8810a34b9ae27d3c7f22f1d870df942b3e4c21037075f65efa1aa127924b13211275e2361fdac4d26a96768e52ab4194 +EBUILD freebsd-sbin-9.9999.ebuild 2686 SHA256 27c70f68e06e8d5c41f5a57b42f4695584a6c44490242519c926eb54c77e3686 SHA512 9b781226aaca3b8b561330b413c3ecdf43431a86b9cc72ec243d6080c32369e963fa740088a45b1d7c292e1fd4133d483ee69472110ad99537a1880d43f81aca WHIRLPOOL c7a8e7762d23fa10b2f29997bbbca4183c97d693b52544e85270392e93804e8ef12348f0627554081975bbdd0edc6717390e91fd1ca10e3271c0dfee726f5c7d diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild index 6626bda..7408e83 100644 --- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild +++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild @@ -55,7 +55,7 @@ PATCHES=( "${FILESDIR}/${PN}-setXid.patch" "${FILESDIR}/${PN}-bsdxml2expat.patch" ) src_prepare() { - use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" } src_install() { diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest index a9582f1..9a4d377 100644 --- a/sys-freebsd/freebsd-share/Manifest +++ b/sys-freebsd/freebsd-share/Manifest @@ -3,6 +3,5 @@ AUX freebsd-share-5.4-gentoo-skel.patch 621 SHA256 5480127971c2a5df5faf44355d5ed AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853 WHIRLPOOL f8d6675121ac43d2672f77d7ea4215073ff213c311fc1c09fe367f2d86f7dc1791a95f31b6def6f5bb757a5cd682de4c373c91465aa05acd38acfb537e781a6a AUX freebsd-share-9.0-gentoowaydir.patch 314 SHA256 68ddc9d6d95c95fc295f3ed3f7d7562de01ff6894b002bd7455d2da72cf4e2f2 SHA512 ef325e79806d78ede26567268829949de3aab02db1b7ea5f1dd834d4deeeddee8338679f7196fee6dc1a5682ccd79c1a0bdd73c96349961a8e1c2153fcf84afd WHIRLPOOL 10448b2cd090068b698d2d9037f2a217cdc20cebcfce4a13f98111ae4e4a2073ce4cb274ec3a7011c2e89acc1b2ab1b5e8e3d141817c065fdb35d1879ae31c37 AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256 0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512 b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e WHIRLPOOL ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b -EBUILD freebsd-share-9.2.9999_p253912.ebuild 2745 SHA256 c8fef91174dda270eb89b5c33e455ff3b53f2896b3f7e9a831ffe4dc0c165f0e SHA512 ab26d361691786ad6c784177242bc6fa68b0d9d43c7e6bf4edbcca0540bcfd70ed39aaefb1e78ec71506e125fa77f58ce287216d974c7022439fbac158167c89 WHIRLPOOL 4f8f567a79e88b7a35452ccdc87f0f486b998075422a549c2092d4d48ba7a24b45828067386b138b9b6924488d6b1c42d314fd4fdb745a6862b213ebb8ecf278 -EBUILD freebsd-share-9.9999.ebuild 2745 SHA256 c8fef91174dda270eb89b5c33e455ff3b53f2896b3f7e9a831ffe4dc0c165f0e SHA512 ab26d361691786ad6c784177242bc6fa68b0d9d43c7e6bf4edbcca0540bcfd70ed39aaefb1e78ec71506e125fa77f58ce287216d974c7022439fbac158167c89 WHIRLPOOL 4f8f567a79e88b7a35452ccdc87f0f486b998075422a549c2092d4d48ba7a24b45828067386b138b9b6924488d6b1c42d314fd4fdb745a6862b213ebb8ecf278 +EBUILD freebsd-share-9.9999.ebuild 2739 SHA256 8454228274dcb88de3568b4c14d80e02f035f7e5772ca564f3769bca4ba2bed2 SHA512 4996f0ae0b744a29583b6bf6c2843ae3bae6fd5fd5272f07f1c602cf17f4fdaeb206741749ed25f1f7479b5895091ca9a75695190aa5b929e72c9688c0e8f633 WHIRLPOOL 4012795a14b149a671757de6d965a49d3a708bbe2dbd89ea8bff98d5f4116a445c66a5e909fc1bf3f93722f9b0f6d1cf94b03278a4dcceca62021c399c65bd03 MISC metadata.xml 223 SHA256 5c9860c4ce81b51fef51a6c5e87081bfd13e74ba452c27191a1abc0ca5ff0aa0 SHA512 3dc7fea8c9f850d63d4f9f24af639fb41d406c2e87439eb960c401412b37e7dc7ab6822d446ec113eb079aba30967391e95cd71dceb889753ed969bc51f6064e WHIRLPOOL 577570d1260a6ef86155c1647e3d90c18aa9b83a89027dcea28b70d22df60e413cee353083d7e915d81129f447772dc7dc4ea766e478a9cf363dabce5d9042de diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild index af9a3cc..ef3787f 100644 --- a/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild +++ b/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild @@ -75,7 +75,7 @@ src_unpack() { "${S}/${sdir}/Makefile" || \ die "Error fixing ${sdir}/Makefile" done - ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink" + ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink" } src_compile() { diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index b84b834..1eef78f 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -12,8 +12,6 @@ AUX freebsd-sources-9.1-MFC-r239588.patch 3076 SHA256 c23f0f8b66c06e024413db4926 AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218 AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d -AUX freebsd-sources-9.2-no_ctf.patch 1076 SHA256 35a1263b10208dc1e1e241bec4724009d809d270a54c06cfc77bfe5316b30d8b SHA512 aa2b71da3aabe89646f4f5006498223242b7d7e34dcf95a6334cd1deda57c5513a74847199f7bdfe575d86797c3c33a73af09a88b537d931d14881e76d8105fc WHIRLPOOL 3d4943cb6fdc8bc81713d6efed836fe8d61ece0a214cf76d516f7ca472a2bec5f0b38d7626aae7e3865871beea100d4082c050e38b1cc147f618c42bcb10a0af AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d -EBUILD freebsd-sources-9.2.9999_p253912.ebuild 2547 SHA256 db31053956433d9c7629645e20d1ff33999e49f18373197c246ebff4c7986a96 SHA512 1c15a89264aecbcaf4cdc4ac064b64c0e1f1cdc9dcb361fd8e8f92535eae818c791f284c5bb7551edec3fee840f173c695225fe0a5262d32bbe497a1ecdba09d WHIRLPOOL 182e6f0790a3f30565c9f47b0ce564ba21fb0eb46c33a4e13bc3b4501c58a9e8aa1ddf87b6101e4016fd65c3b36f1f793e943eb7afd888626652f67a7c69b721 -EBUILD freebsd-sources-9.9999.ebuild 2547 SHA256 db31053956433d9c7629645e20d1ff33999e49f18373197c246ebff4c7986a96 SHA512 1c15a89264aecbcaf4cdc4ac064b64c0e1f1cdc9dcb361fd8e8f92535eae818c791f284c5bb7551edec3fee840f173c695225fe0a5262d32bbe497a1ecdba09d WHIRLPOOL 182e6f0790a3f30565c9f47b0ce564ba21fb0eb46c33a4e13bc3b4501c58a9e8aa1ddf87b6101e4016fd65c3b36f1f793e943eb7afd888626652f67a7c69b721 +EBUILD freebsd-sources-9.9999.ebuild 2920 SHA256 19126b7f6b01ce4e2a062972cca1b52a644912d9e7fb32c9b34973318aced25e SHA512 a9c5c773c0ec31b00dc01d53b5e9240a138cb8512f0e8a581506e7b12ab9b29e176fd25e4417228ba759c5f07c39d67821af7e01ecc3f9642a526a8663e4265d WHIRLPOOL 1b11ec494f047a460ea70d363998cd296d6f0965910e470b74e5351cdaefa3aa65ac6ac52dd485f81bdd126eba192faed8f8b8f5c50b114ab081d25231f2e2c9 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch deleted file mode 100644 index a3fe93f..0000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC -index 20d0c3f..3f5bf52 100644 ---- a/sys/amd64/conf/GENERIC -+++ b/sys/amd64/conf/GENERIC -@@ -22,7 +22,8 @@ cpu HAMMER - ident GENERIC - - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols --makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support -+#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support -+nomakeoptions WITH_CTF # Disabled on Gentoo/FreeBSD - - options SCHED_ULE # ULE scheduler - options PREEMPTION # Enable kernel thread preemption -diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC -index f77b0fc..1f67a3a 100644 ---- a/sys/i386/conf/GENERIC -+++ b/sys/i386/conf/GENERIC -@@ -24,7 +24,8 @@ cpu I686_CPU - ident GENERIC - - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols --makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support -+#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support -+nomakeoptions WITH_CTF # Disabled on Gentoo/FreeBSD - - options SCHED_ULE # ULE scheduler - options PREEMPTION # Enable kernel thread preemption diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild index 2f4565a..34b490a 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild @@ -2,26 +2,35 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit bsdmk freebsd flag-o-matic +EAPI=5 + +inherit bsdmk freebsd flag-o-matic toolchain-funcs DESCRIPTION="FreeBSD kernel sources" -SLOT="${RV}" +SLOT="0" -IUSE="symlink" +IUSE="+build-generic profile" if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SRC_URI="mirror://gentoo/${SYS}.tar.bz2" fi -RDEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* +RDEPEND="=sys-freebsd/freebsd-cddl-${RV}* + =sys-freebsd/freebsd-mk-defs-${RV}* !sys-freebsd/virtio-kmod" -DEPEND="" +DEPEND="build-generic? ( + =sys-freebsd/freebsd-cddl-${RV}* + =sys-freebsd/freebsd-usbin-${RV}* + =sys-freebsd/freebsd-mk-defs-${RV}* + )" RESTRICT="strip binchecks" S="${WORKDIR}/sys" +KERN_BUILD=GENERIC + PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${FILESDIR}/${PN}-9.2-gentoo.patch" "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" @@ -30,13 +39,10 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" "${FILESDIR}/${PN}-7.1-includes.patch" "${FILESDIR}/${PN}-9.0-sysctluint.patch" - "${FILESDIR}/${PN}-9.2-no_ctf.patch" "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" ) -src_unpack() { - freebsd_src_unpack - +src_prepare() { # This replaces the gentoover patch, it doesn't need reapply every time. sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ @@ -53,28 +59,45 @@ src_unpack() { sed -e "s:-Werror:-Wno-error:g" \ -i "${S}/conf/kern.pre.mk" \ -i "${S}/conf/kmod.mk" || die + + # Only used with USE=build-generic, let the kernel build with its own flags, its safer. + unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL +} + +src_configure() { + if use build-generic ; then + tc-export CC + cd "${S}/$(tc-arch-kernel)/conf" || die + config ${KERN_BUILD} || die + fi } src_compile() { - einfo "Nothing to compile.." + if use build-generic ; then + cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die + freebsd_src_compile depend + freebsd_src_compile + else + einfo "Nothing to compile.." + fi } src_install() { - insinto "/usr/src/sys-${RV}" + if use build-generic ; then + cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die + freebsd_src_install + rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" + cd "${S}" + fi + + insinto "/usr/src/sys" doins -r "${S}/"* } -pkg_postinst() { - if [[ ! -L "${ROOT}/usr/src/sys" ]]; then - einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${RV}..." - ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - elif use symlink; then - einfo "Updating /usr/src/sys symlink to sys-${RV}..." - rm "${ROOT}/usr/src/sys" || \ - eerror "Couldn't remove previous symlinks, please fix manually." - ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." +pkg_preinst() { + if [[ -L "${ROOT}/usr/src/sys" ]]; then + einfo "/usr/src/sys is a symlink, removing it..." + rm -f "${ROOT}/usr/src/sys" fi if use sparc-fbsd ; then diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest index 57475a6..71ad132 100644 --- a/sys-freebsd/freebsd-ubin/Manifest +++ b/sys-freebsd/freebsd-ubin/Manifest @@ -17,5 +17,4 @@ AUX passwd.1.pamd 269 SHA256 a00b23b70388075f20c0e6535b6f4a1bebacb72726dc3c20ed1 AUX passwd.pamd 360 SHA256 ff964fd309462cac711422be051122f8a60b570da9b13756e9012b18b1864f79 SHA512 f7b4accac065a41d453aacb63222bb9da8183ad5a3ba699530a6cd5fecb5e54ee308fd0a58e00a95cc394402aab7dfd9cded1bae58483d826ced5b20b0d14c27 WHIRLPOOL e46ecd4f2945f6121c89daf8c1640e868508d85fb10c4d9bc3ccc1e04999097f226d5b7d3cb1605ffe2544f4da0127bc9ebce985d086bf96e06a659981e9a4ee AUX su.1.pamd 432 SHA256 a231f9cbe5b9e03aa0aaa1520657332771f15d5e5cd69890ce49d02bb34e21c3 SHA512 7d7d8ef2a5b1b52b1b5aa5de86a8767a0aa217fb2658c9bb13bce09e3c68c1a4e15f287d2063a3f18615b9d7dc1eba1ebefb95c1510f9a4c7b7de810a5bcfa40 WHIRLPOOL 635fd8294abf9e8948032ab2b6d50565f2f9f72ea64c18799a6337776bdf2a7859e17bb58e3e1ab3558d74a10611225c31ac4b6cb26f1c5462bf855b02dc9e07 AUX su.pamd 420 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 SHA512 25ac749209c05733d0c9978c8ef1712961a3bd863bb2f5615844ed9b44e98dcf7795c02dfc84d58703eca35331701f1fff06a13904792e634256675af5444a48 WHIRLPOOL c97d3314cd58edff9c05b8286e2a377ae928752197dec0d380fa68867a9e8ce5366cc97e8038c21c3f50f527957b6ecc6c723960e28e39a7e8fef1cf7f3caad1 -EBUILD freebsd-ubin-9.2.9999_p253912.ebuild 5385 SHA256 90177e95b4600e385cd56f60cd6488f75d15c40ce4a8ca2fbccaf71fbd2878c9 SHA512 4008bf4f91eddb76e7ac6c9668336da35d646681d46c89a7d071c08791ad5d3710d9625532f378f884cad613825999b7af5ae7c9acb46968faeff8284de6eedc WHIRLPOOL 69d9aaca40ad525e5fef94c16217e162fa83096d7938b41801c3fd917578fde96122e7c385bf270477b65e483da77ebdf84b637375a1acf53b3c043191580fcb -EBUILD freebsd-ubin-9.9999.ebuild 5385 SHA256 90177e95b4600e385cd56f60cd6488f75d15c40ce4a8ca2fbccaf71fbd2878c9 SHA512 4008bf4f91eddb76e7ac6c9668336da35d646681d46c89a7d071c08791ad5d3710d9625532f378f884cad613825999b7af5ae7c9acb46968faeff8284de6eedc WHIRLPOOL 69d9aaca40ad525e5fef94c16217e162fa83096d7938b41801c3fd917578fde96122e7c385bf270477b65e483da77ebdf84b637375a1acf53b3c043191580fcb +EBUILD freebsd-ubin-9.9999.ebuild 5346 SHA256 318cb2b35329bfd3e539420da4a3057842dc864e6625c267865b4d2551fea833 SHA512 072f12573db61aebaf6cea242d1abd7c75fda593026bbd26c67149c5bac3ab3d1597dc1431fd436dbea31f048d1a7252bfa1b2161382d43205e8e40a2811a86c WHIRLPOOL 1052757abdfa3155822bb740a83173219b32f1aaadbf5dd88db25ccda451b1d915ea59d9a63daaaa14d525aec6bff0ff9d84cb3d76d8f092fdf719a358b8fbff diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.9999.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.9999.ebuild index ca191ee..be0a016 100644 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.9999.ebuild +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.9999.ebuild @@ -4,11 +4,11 @@ EAPI=5 -inherit bsdmk freebsd flag-o-matic pam multilib multibuild +inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build DESCRIPTION="FreeBSD's base system source for /usr/bin" SLOT="0" -IUSE="ar atm audit bluetooth ipv6 kerberos multilib netware nis ssl usb build zfs" +IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" LICENSE="BSD zfs? ( CDDL )" if [[ ${PV} != *9999* ]]; then @@ -23,8 +23,7 @@ if [[ ${PV} != *9999* ]]; then build? ( mirror://gentoo/${SYS}.tar.bz2 )" fi -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?] - >=sys-freebsd/freebsd-lib-9.1-r7[multilib?] +RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) @@ -79,12 +78,6 @@ REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio bc dc whois tftp man" -if use multilib ; then - MULTIBUILD_VARIANTS=( $(get_all_abis) ) -else - MULTIBUILD_VARIANTS=${DEFAULT_ABI} -fi - pkg_setup() { use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " @@ -109,7 +102,7 @@ pkg_preinst() { } src_prepare() { - use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" # Rename manpage for renamed cmp mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die @@ -126,7 +119,7 @@ src_prepare() { } setup_multilib_vars() { - if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then + if ! multilib_is_native_abi ; then cd "${WORKDIR}/usr.bin/ldd" || die export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN=" else @@ -136,10 +129,12 @@ setup_multilib_vars() { } src_compile() { + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile } src_install() { + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install # baselayout requires these in /bin diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest index 9795f0c..943fa58 100644 --- a/sys-freebsd/freebsd-usbin/Manifest +++ b/sys-freebsd/freebsd-usbin/Manifest @@ -17,5 +17,4 @@ AUX rpcbind.initd 716 SHA256 2f14334ba584acd31306060bd134c0eccd3afa24c61531f93f8 AUX syscons.confd 464 SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b1013ce02e44ee SHA512 c505aac9328557d344c64a5615f53a3b87faa39daf94169a652cd0a6447b3173b347f90bf87ba3806978dc57eaf46fac2301c10015397e25c070f5a21a760c61 WHIRLPOOL 02fc5189f82aad4e1052831d3d4d394a65161e241fe7714fa7af193f929af08889e43aa2f1088660935da5a14291bd4ed3a566218262ac8bfccb33ee637c2bfa AUX syscons.initd 1711 SHA256 16f5ab3ceb67accc10350d21527321c1e559c432f0b52e7b3adf08b67d9f62aa SHA512 41fef393e1fe732de065cb9ac3fdb4bbe73158a86f7c8b6175b496d0a65b9c682d888ce7b34c8a43732909c12626a2f5783457607e4b9bf6b4210589c3397d76 WHIRLPOOL 7a11eed37860db8dce71ad09299bd48427cf2beb349da3799189ef93d4d5c618b4c33b51e60f17cb485989dd3e0480458f5559c61deaa3f542f920df43f89801 AUX syslogd.initd 571 SHA256 3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005 SHA512 0c67138b2461ba3629a7aa87dca35357ee17f2a1c1c13e1951417f4c05054ad006efb7f98dcf7fa24f0b90e0c0331e6fb7d1e3459c1db17f1bc82baa63b3beeb WHIRLPOOL e8dc6a0f402a474bb98c5d4a9a21b331a2a55726d517411c2b7c7adec28219e5a538ebb448c6c27dd1540affb914e935e91160cb0795ca6eb624f4ee163b0e9d -EBUILD freebsd-usbin-9.2.9999_p253912.ebuild 5517 SHA256 9f5d12601dd5ee14774d2645a1671e8c28eedecfe23ed93fdbb515839949f7fe SHA512 437e2e105f220204c675a3dde5d38ed1c12501f863bd27550057f6966c358c021ef7dc2867e9c7a887f5988aa938c8499742167aa6965b9d0159c0e2c31745db WHIRLPOOL cbbe5831c05d9f5c2bf8788bb406b74b0f04266b5be3d057b5742a43ec97fde977928e082b9b21e35a18da522a32203fbe6c9f54a3dcb3a5af4a3ce3ec26947b -EBUILD freebsd-usbin-9.9999.ebuild 5517 SHA256 9f5d12601dd5ee14774d2645a1671e8c28eedecfe23ed93fdbb515839949f7fe SHA512 437e2e105f220204c675a3dde5d38ed1c12501f863bd27550057f6966c358c021ef7dc2867e9c7a887f5988aa938c8499742167aa6965b9d0159c0e2c31745db WHIRLPOOL cbbe5831c05d9f5c2bf8788bb406b74b0f04266b5be3d057b5742a43ec97fde977928e082b9b21e35a18da522a32203fbe6c9f54a3dcb3a5af4a3ce3ec26947b +EBUILD freebsd-usbin-9.9999.ebuild 5493 SHA256 b821720c524c3f56597a88ddd37bd03efdd10ccc36d5df55b7ed9cc5b8a8b3cd SHA512 45c970dfef5dfae2e4abde5c3a9119822a83545df739536182eece4e3b6d5bd8638e1519db9e1c4f02f1ab5f4a92f0629f5168a06064d1f2e9465f6914f18dfe WHIRLPOOL 7f0cb9d44fa7dba1d36fd3b539ab1569602825537fd63e6d9b858d253bf60deb55b17d72d9fd9621b90f0bfef8f3dab3faa672abd51163e82c246f2383a5b7a8 diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild index a64d230..92f3bcc 100644 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild @@ -20,18 +20,18 @@ if [[ ${PV} != *9999* ]]; then mirror://gentoo/${GNU}.tar.bz2 nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 ) build? ( mirror://gentoo/${SYS}.tar.bz2 - mirror://gentoo/${INCLUDE}.tar.bz2 )" + mirror://gentoo/${INCLUDE}.tar.bz2 )" fi RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-${RV}* =sys-freebsd/freebsd-contrib-${RV}* + acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) >=app-arch/libarchive-3 sys-apps/tcp-wrappers dev-util/dialog - dev-libs/libelf >=dev-libs/libedit-20120311.3.0-r1 net-libs/libpcap kerberos? ( app-crypt/heimdal )" @@ -62,7 +62,7 @@ pkg_setup() { use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= " + use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= " mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= " @@ -84,11 +84,11 @@ REMOVE_SUBDIRS=" tcpdump ndp inetd wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase zic amd - pkg pkg_install freebsd-update sysrc service" + pkg pkg_install freebsd-update service sysrc" src_prepare() { if ! use build; then - ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + ln -s "/usr/src/sys" "${WORKDIR}/sys" ln -s "/usr/include" "${WORKDIR}/include" else dummy_mk mount_smbfs