Gentoo Archives: gentoo-commits

From: Yuta SATOH <nigoro@×××××××××.jp>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
Date: Wed, 28 Sep 2016 12:25:08
Message-Id: 1475064216.71c6af1834ace305d5bdc7de9baea656151e93c5.yuta_satoh@gentoo
1 commit: 71c6af1834ace305d5bdc7de9baea656151e93c5
2 Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
3 AuthorDate: Wed Sep 28 12:03:36 2016 +0000
4 Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
5 CommitDate: Wed Sep 28 12:03:36 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=71c6af18
7
8 eclass/freebsd.eclass: add Gentoo/FreeBSD 11.0 support.
9
10 eclass/freebsd.eclass | 35 +++++++++++++++++++++++++++++++----
11 1 file changed, 31 insertions(+), 4 deletions(-)
12
13 diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
14 index 57f9d45..1e141da 100644
15 --- a/eclass/freebsd.eclass
16 +++ b/eclass/freebsd.eclass
17 @@ -80,7 +80,7 @@ if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then
18 SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz"
19 fi
20
21 -IUSE="profile"
22 +IUSE="debug profile"
23
24 #unalias -a
25 alias install-info='/usr/bin/bsdinstall-info'
26 @@ -187,7 +187,9 @@ freebsd_src_unpack() {
27 dummy_mk ${REMOVE_SUBDIRS}
28
29 freebsd_do_patches
30 - freebsd_rename_libraries
31 + if ! version_is_at_least 11.0 ${RV} ; then
32 + freebsd_rename_libraries
33 + fi
34
35 # Starting from FreeBSD 9.2, its install command supports the -l option and
36 # they now use it. Emulate it if we are on a system that does not have it.
37 @@ -195,11 +197,25 @@ freebsd_src_unpack() {
38 export INSTALL_LINK="ln -f"
39 export INSTALL_SYMLINK="ln -fs"
40 fi
41 + if version_is_at_least 11.0 ${RV} ; then
42 + export RSYMLINK=" -l s"
43 + fi
44 }
45
46 freebsd_src_compile() {
47 use profile && filter-flags "-fomit-frame-pointer"
48 - use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
49 + if version_is_at_least 11.0 ${RV} ; then
50 + if ! use profile ; then
51 + mymakeopts="${mymakeopts} MK_PROFILE=no "
52 + fi
53 + use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no "
54 + # Test does not support yet.
55 + mymakeopts="${mymakeopts} MK_TESTS=no "
56 + # Force set SRCTOP.
57 + mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} "
58 + else
59 + use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
60 + fi
61
62 mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
63
64 @@ -260,7 +276,18 @@ freebsd_multilib_multibuild_wrapper() {
65 }
66
67 freebsd_src_install() {
68 - use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
69 + if version_is_at_least 11.0 ${RV} ; then
70 + if ! use profile ; then
71 + mymakeopts="${mymakeopts} MK_PROFILE=no "
72 + fi
73 + use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no "
74 + # Test does not support yet.
75 + mymakeopts="${mymakeopts} MK_TESTS=no "
76 + # Force set SRCTOP.
77 + mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} "
78 + else
79 + use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
80 + fi
81
82 mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="