From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F1AF359CA3 for ; Tue, 1 Mar 2016 10:07:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 885D021C01F; Tue, 1 Mar 2016 10:07:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6901A21C020 for ; Tue, 1 Mar 2016 10:07:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D9FA3409D0 for ; Tue, 1 Mar 2016 10:07:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3377018A5 for ; Tue, 1 Mar 2016 10:07:03 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1456826813.feec564b833066ded6d8ce8ecd2227180ef1881f.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild X-VCS-Directories: sys-freebsd/freebsd-lib/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: feec564b833066ded6d8ce8ecd2227180ef1881f X-VCS-Branch: master Date: Tue, 1 Mar 2016 10:07:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c5c1675b-23b0-413d-b1b1-67e0f961f9f5 X-Archives-Hash: 93b9b4a8d67704bbcce45ec33073e781 commit: feec564b833066ded6d8ce8ecd2227180ef1881f Author: Alexis Ballier gentoo org> AuthorDate: Tue Mar 1 09:11:17 2016 +0000 Commit: Alexis Ballier gentoo 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 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