From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C004C138D74 for ; Tue, 25 Oct 2016 00:08:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12EF4E0B1F; Tue, 25 Oct 2016 00:08:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1232E0B1F for ; Tue, 25 Oct 2016 00:08:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C19F3416A7 for ; Tue, 25 Oct 2016 00:08:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71BEF24A0 for ; Tue, 25 Oct 2016 00:08:46 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1477354119.0aac30462244120dbebf37848ebe8c303cf6aad2.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/zstd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/zstd/zstd-1.1.0.ebuild X-VCS-Directories: app-arch/zstd/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 0aac30462244120dbebf37848ebe8c303cf6aad2 X-VCS-Branch: master Date: Tue, 25 Oct 2016 00:08:46 +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: f2c0e710-cb8c-440a-a01d-7c7449f7bf46 X-Archives-Hash: 7ca738d3423ce7caf3d5fe5ba9d98181 commit: 0aac30462244120dbebf37848ebe8c303cf6aad2 Author: David Seifert gentoo org> AuthorDate: Tue Oct 25 00:08:14 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Oct 25 00:08:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aac3046 app-arch/zstd: Fix ebuild * Replace EROOT in src_* functions * Call einstalldocs to install basic docs * Use proper || die's for removing static libraries * Pass CC and AR to make commands Package-Manager: portage-2.3.2 app-arch/zstd/zstd-1.1.0.ebuild | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/app-arch/zstd/zstd-1.1.0.ebuild b/app-arch/zstd/zstd-1.1.0.ebuild index bcfe360..4e42b4f 100644 --- a/app-arch/zstd/zstd-1.1.0.ebuild +++ b/app-arch/zstd/zstd-1.1.0.ebuild @@ -4,6 +4,8 @@ EAPI=6 +inherit toolchain-funcs + DESCRIPTION="zstd fast compression library" HOMEPAGE="http://facebook.github.io/zstd/" SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -16,15 +18,27 @@ IUSE="static-libs" PATCHES=( "${FILESDIR}/${P}-fix_build_system.patch" ) src_compile() { - emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" zstd - cd lib && - emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" libzstd + emake \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd + + emake -C lib \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd } src_install() { - emake DESTDIR="${D}" \ - PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" install + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + einstalldocs - ! use static-libs && - rm -f $ "${ED}usr/$(get_libdir)/libzstd.a" + if ! use static-libs; then + rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die + fi }