[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/

[Alexis Ballier]

commit:     feec564b833066ded6d8ce8ecd2227180ef1881f
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 09:11:17 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 10:06:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feec564b

sys-freebsd/freebsd-lib: discriminate GNU userland based on CBUILD:-CHOST which 
helps when cross-compiling.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild 
b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index 0ce19a2..23f5e85 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -212,7 +212,7 @@ src_prepare() {
        # Try to fix sed calls for GNU sed. Do it only with GNU userland and 
force
        # BSD's sed on BSD.
        cd "${S}"
-       if use userland_GNU; then
+       if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then
                find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
                sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die
        fi
@@ -359,7 +359,7 @@ do_compile() {
 src_compile() {
        # Does not work with GNU sed
        # Force BSD's sed on BSD.
-       if use userland_BSD ; then
+       if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then
                export ESED=/usr/bin/sed
                unalias sed
        fi