| 1 |
commit: 5fdebd5d0c9b22a9e046fba384ddbd4c06587830 |
| 2 |
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 9 09:15:50 2016 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 5 |
CommitDate: Sun Oct 9 09:15:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=5fdebd5d |
| 7 |
|
| 8 |
freebsd.eclass: freebsd 11.0 does not support NO_ variable. |
| 9 |
|
| 10 |
eclass/freebsd.eclass | 22 ++++++++++++++-------- |
| 11 |
1 file changed, 14 insertions(+), 8 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass |
| 14 |
index 8bab9af..5d4562a 100644 |
| 15 |
--- a/eclass/freebsd.eclass |
| 16 |
+++ b/eclass/freebsd.eclass |
| 17 |
@@ -228,18 +228,21 @@ freebsd_src_compile() { |
| 18 |
use profile && filter-flags "-fomit-frame-pointer" |
| 19 |
if version_is_at_least 11.0 ${RV} ; then |
| 20 |
if ! use profile ; then |
| 21 |
- mymakeopts="${mymakeopts} MK_PROFILE=no " |
| 22 |
+ mymakeopts="${mymakeopts} WITHOUT_PROFILE= " |
| 23 |
fi |
| 24 |
- use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no " |
| 25 |
+ use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " |
| 26 |
# Test does not support yet. |
| 27 |
- mymakeopts="${mymakeopts} MK_TESTS=no " |
| 28 |
+ mymakeopts="${mymakeopts} WITHOUT_TESTS= " |
| 29 |
# Force set SRCTOP. |
| 30 |
mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " |
| 31 |
+ # Set common option. |
| 32 |
+ mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " |
| 33 |
else |
| 34 |
use profile || mymakeopts="${mymakeopts} NO_PROFILE= " |
| 35 |
+ mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " |
| 36 |
fi |
| 37 |
|
| 38 |
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG=" |
| 39 |
+ mymakeopts="${mymakeopts} NO_FSCHG=" |
| 40 |
|
| 41 |
# Make sure to use FreeBSD definitions while crosscompiling |
| 42 |
[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" |
| 43 |
@@ -300,18 +303,21 @@ freebsd_multilib_multibuild_wrapper() { |
| 44 |
freebsd_src_install() { |
| 45 |
if version_is_at_least 11.0 ${RV} ; then |
| 46 |
if ! use profile ; then |
| 47 |
- mymakeopts="${mymakeopts} MK_PROFILE=no " |
| 48 |
+ mymakeopts="${mymakeopts} WITHOUT_PROFILE= " |
| 49 |
fi |
| 50 |
- use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no " |
| 51 |
+ use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " |
| 52 |
# Test does not support yet. |
| 53 |
- mymakeopts="${mymakeopts} MK_TESTS=no " |
| 54 |
+ mymakeopts="${mymakeopts} WITHOUT_TESTS= " |
| 55 |
# Force set SRCTOP. |
| 56 |
mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " |
| 57 |
+ # Set common option. |
| 58 |
+ mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " |
| 59 |
else |
| 60 |
use profile || mymakeopts="${mymakeopts} NO_PROFILE= " |
| 61 |
+ mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " |
| 62 |
fi |
| 63 |
|
| 64 |
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG=" |
| 65 |
+ mymakeopts="${mymakeopts} NO_FSCHG=" |
| 66 |
|
| 67 |
[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" |
Archives