| 1 |
commit: feec564b833066ded6d8ce8ecd2227180ef1881f |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 1 09:11:17 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 1 10:06:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feec564b |
| 7 |
|
| 8 |
sys-freebsd/freebsd-lib: discriminate GNU userland based on CBUILD:-CHOST which helps when cross-compiling. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 4 ++-- |
| 14 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild |
| 17 |
index 0ce19a2..23f5e85 100644 |
| 18 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild |
| 19 |
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild |
| 20 |
@@ -212,7 +212,7 @@ src_prepare() { |
| 21 |
# Try to fix sed calls for GNU sed. Do it only with GNU userland and force |
| 22 |
# BSD's sed on BSD. |
| 23 |
cd "${S}" |
| 24 |
- if use userland_GNU; then |
| 25 |
+ if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then |
| 26 |
find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; |
| 27 |
sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die |
| 28 |
fi |
| 29 |
@@ -359,7 +359,7 @@ do_compile() { |
| 30 |
src_compile() { |
| 31 |
# Does not work with GNU sed |
| 32 |
# Force BSD's sed on BSD. |
| 33 |
- if use userland_BSD ; then |
| 34 |
+ if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then |
| 35 |
export ESED=/usr/bin/sed |
| 36 |
unalias sed |
| 37 |
fi |
Archives