From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E729138331 for ; Wed, 28 Sep 2016 12:25:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 158EAE09A9; Wed, 28 Sep 2016 12:25:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B38ABE09A9 for ; Wed, 28 Sep 2016 12:25:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 301CF3408F0 for ; Wed, 28 Sep 2016 12:25:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 884E4249C for ; Wed, 28 Sep 2016 12:25:00 +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: <1475064216.71c6af1834ace305d5bdc7de9baea656151e93c5.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: eclass/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: eclass/freebsd.eclass X-VCS-Directories: eclass/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 71c6af1834ace305d5bdc7de9baea656151e93c5 X-VCS-Branch: master Date: Wed, 28 Sep 2016 12:25:00 +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: 2f777773-f4d6-4923-851d-faad412bae8d X-Archives-Hash: 8bcbcc7a6e3475b19f6a0a9bf32c5c21 commit: 71c6af1834ace305d5bdc7de9baea656151e93c5 Author: Yuta SATOH gmail com> AuthorDate: Wed Sep 28 12:03:36 2016 +0000 Commit: Yuta SATOH gentoo gr jp> CommitDate: Wed Sep 28 12:03:36 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=71c6af18 eclass/freebsd.eclass: add Gentoo/FreeBSD 11.0 support. eclass/freebsd.eclass | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 57f9d45..1e141da 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -80,7 +80,7 @@ if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz" fi -IUSE="profile" +IUSE="debug profile" #unalias -a alias install-info='/usr/bin/bsdinstall-info' @@ -187,7 +187,9 @@ freebsd_src_unpack() { dummy_mk ${REMOVE_SUBDIRS} freebsd_do_patches - freebsd_rename_libraries + if ! version_is_at_least 11.0 ${RV} ; then + freebsd_rename_libraries + fi # Starting from FreeBSD 9.2, its install command supports the -l option and # they now use it. Emulate it if we are on a system that does not have it. @@ -195,11 +197,25 @@ freebsd_src_unpack() { export INSTALL_LINK="ln -f" export INSTALL_SYMLINK="ln -fs" fi + if version_is_at_least 11.0 ${RV} ; then + export RSYMLINK=" -l s" + fi } freebsd_src_compile() { use profile && filter-flags "-fomit-frame-pointer" - use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + if version_is_at_least 11.0 ${RV} ; then + if ! use profile ; then + mymakeopts="${mymakeopts} MK_PROFILE=no " + fi + use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no " + # Test does not support yet. + mymakeopts="${mymakeopts} MK_TESTS=no " + # Force set SRCTOP. + mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " + else + use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + fi mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG=" @@ -260,7 +276,18 @@ freebsd_multilib_multibuild_wrapper() { } freebsd_src_install() { - use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + if version_is_at_least 11.0 ${RV} ; then + if ! use profile ; then + mymakeopts="${mymakeopts} MK_PROFILE=no " + fi + use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no " + # Test does not support yet. + mymakeopts="${mymakeopts} MK_TESTS=no " + # Force set SRCTOP. + mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " + else + use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + fi mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="