| 1 |
commit: 7be601e3c17d1abf9b368818ab7f25f9db156f96 |
| 2 |
Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Sep 18 11:31:34 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 2 08:56:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be601e3 |
| 7 |
|
| 8 |
eclass/freebsd.eclass: update some comments. |
| 9 |
|
| 10 |
eclass/freebsd.eclass | 30 +++++++++++++++--------------- |
| 11 |
1 file changed, 15 insertions(+), 15 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass |
| 14 |
index 24bab67ce62..64d28f9d483 100644 |
| 15 |
--- a/eclass/freebsd.eclass |
| 16 |
+++ b/eclass/freebsd.eclass |
| 17 |
@@ -1,4 +1,4 @@ |
| 18 |
-# Copyright 1999-2015 Gentoo Foundation |
| 19 |
+# Copyright 1999-2017 Gentoo Foundation |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# |
| 22 |
# @MAINTAINER: |
| 23 |
@@ -68,7 +68,7 @@ if [[ ${MY_PV} == *9999* ]]; then |
| 24 |
ESVN_PROJECT="freebsd-${BRANCH}" |
| 25 |
fi |
| 26 |
|
| 27 |
-# use the original source code. |
| 28 |
+# Use the original source code. |
| 29 |
if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then |
| 30 |
DL_PV=${MY_PV/_rc/-RC} |
| 31 |
DL_PV=${DL_PV/_beta/-BETA} |
| 32 |
@@ -114,7 +114,7 @@ freebsd_get_bmake() { |
| 33 |
echo "${bmake}" |
| 34 |
} |
| 35 |
|
| 36 |
-# Generates a patch SRC_URI or DISTDIR of upstream. |
| 37 |
+# Generates SRC_URI or DISTDIR for the upstream patch. |
| 38 |
freebsd_upstream_patches() { |
| 39 |
local opt=$1 |
| 40 |
[[ ${#UPSTREAM_PATCHES[@]} -eq 0 ]] && return 1 |
| 41 |
@@ -172,8 +172,8 @@ freebsd_src_unpack() { |
| 42 |
if [[ ${MY_PV} == *9999* ]]; then |
| 43 |
S="${WORKDIR}" subversion_src_unpack |
| 44 |
|
| 45 |
- # When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0 |
| 46 |
- # Removed "${WORKDIR}"/share/mk/*.mk, use to force /usr/share/mk. |
| 47 |
+ # When share/mk exists in ${WORKDIR}, BSD's make will try to use it on FreeBSD 10.0 or later. |
| 48 |
+ # We should remove "${WORKDIR}"/share/mk/*.mk to use /usr/share/mk{,/system}. |
| 49 |
if [[ ${PN} != freebsd-mk-defs ]] ; then |
| 50 |
[[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk |
| 51 |
fi |
| 52 |
@@ -214,7 +214,7 @@ freebsd_src_unpack() { |
| 53 |
export RSYMLINK=" -l s" |
| 54 |
fi |
| 55 |
|
| 56 |
- # When CC=clang, force use clang-cpp #478810, #595878 |
| 57 |
+ # If CC=clang, we should use clang-cpp instead of cpp. #478810, #595878 |
| 58 |
if [[ $(tc-getCC) == *clang* ]] ; then |
| 59 |
if type -P clang-cpp > /dev/null ; then |
| 60 |
export CPP=clang-cpp |
| 61 |
@@ -225,7 +225,7 @@ freebsd_src_unpack() { |
| 62 |
fi |
| 63 |
fi |
| 64 |
|
| 65 |
- # Add a special CFLAGS required for multilib support. |
| 66 |
+ # Add the special CFLAGS required for multilib support. |
| 67 |
use amd64-fbsd && export CFLAGS_x86_fbsd="${CFLAGS_x86_fbsd} -DCOMPAT_32BIT -B/usr/lib32 -L/usr/lib32" |
| 68 |
} |
| 69 |
|
| 70 |
@@ -235,13 +235,13 @@ freebsd_src_compile() { |
| 71 |
if ! use profile ; then |
| 72 |
mymakeopts="${mymakeopts} WITHOUT_PROFILE= " |
| 73 |
fi |
| 74 |
- # Disable debugging info, use FEATURES=splitdebug instead. |
| 75 |
+ # Disable the debugging information, use FEATURES=splitdebug instead. |
| 76 |
mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " |
| 77 |
- # Test does not support yet. |
| 78 |
+ # We don't support test yet. |
| 79 |
mymakeopts="${mymakeopts} WITHOUT_TESTS= " |
| 80 |
- # Force set SRCTOP. |
| 81 |
+ # Set the SRCTOP to detect the source directory. |
| 82 |
mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " |
| 83 |
- # Set common option. |
| 84 |
+ # Set the common settings. |
| 85 |
mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " |
| 86 |
else |
| 87 |
use profile || mymakeopts="${mymakeopts} NO_PROFILE= " |
| 88 |
@@ -311,13 +311,13 @@ freebsd_src_install() { |
| 89 |
if ! use profile ; then |
| 90 |
mymakeopts="${mymakeopts} WITHOUT_PROFILE= " |
| 91 |
fi |
| 92 |
- # Disable debugging info, use FEATURES=splitdebug instead. |
| 93 |
+ # Disable the debugging information, use FEATURES=splitdebug instead. |
| 94 |
mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " |
| 95 |
- # Test does not support yet. |
| 96 |
+ # We don't support test yet. |
| 97 |
mymakeopts="${mymakeopts} WITHOUT_TESTS= " |
| 98 |
- # Force set SRCTOP. |
| 99 |
+ # Set the SRCTOP to detect the source directory. |
| 100 |
mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " |
| 101 |
- # Set common option. |
| 102 |
+ # Set the common settings. |
| 103 |
mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " |
| 104 |
else |
| 105 |
use profile || mymakeopts="${mymakeopts} NO_PROFILE= " |
Archives