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 C3DAE138335 for ; Wed, 17 Apr 2019 13:21:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 671D8E0ACA; Wed, 17 Apr 2019 13:21:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31D74E0ACA for ; Wed, 17 Apr 2019 13:21:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 223DC3415CA for ; Wed, 17 Apr 2019 13:21:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A0475B1 for ; Wed, 17 Apr 2019 13:21:05 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1555507260.60b3ee89cdb77a16333e04f024306c07478f4237.polynomial-c@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.3.7-r1.ebuild app-arch/zstd/zstd-1.3.8.ebuild app-arch/zstd/zstd-1.4.0.ebuild X-VCS-Directories: app-arch/zstd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 60b3ee89cdb77a16333e04f024306c07478f4237 X-VCS-Branch: master Date: Wed, 17 Apr 2019 13:21:05 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3951eec9-19b9-4c2c-b4e4-9ad153b55d3c X-Archives-Hash: 14a42ae70419e325fb23ccc79463f5ae commit: 60b3ee89cdb77a16333e04f024306c07478f4237 Author: Lars Wendler gentoo org> AuthorDate: Wed Apr 17 13:19:07 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Apr 17 13:21:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b3ee89 app-arch/zstd: Simplified multilib ebuilds Package-Manager: Portage-2.3.63, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> app-arch/zstd/zstd-1.3.7-r1.ebuild | 40 +++++++++++++------------------------- app-arch/zstd/zstd-1.3.8.ebuild | 40 +++++++++++++------------------------- app-arch/zstd/zstd-1.4.0.ebuild | 40 +++++++++++++------------------------- 3 files changed, 39 insertions(+), 81 deletions(-) diff --git a/app-arch/zstd/zstd-1.3.7-r1.ebuild b/app-arch/zstd/zstd-1.3.7-r1.ebuild index 86934ff67a4..1561c0dd4a5 100644 --- a/app-arch/zstd/zstd-1.3.7-r1.ebuild +++ b/app-arch/zstd/zstd-1.3.7-r1.ebuild @@ -23,47 +23,33 @@ src_prepare() { multilib_copy_sources } -multilib_src_compile() { - emake -C lib \ +mymake() { + emake \ CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ AR="$(tc-getAR)" \ PREFIX="${EPREFIX}/usr" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - libzstd libzstd.a libzstd.pc + "${@}" +} + +multilib_src_compile() { + mymake -C lib libzstd libzstd.a libzstd.pc if multilib_is_native_abi ; then - emake \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - HAVE_LZ4=$(usex lz4 1 0) \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd + mymake zstd - emake -C contrib/pzstd \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" + mymake -C contrib/pzstd fi } multilib_src_install() { - emake -C lib \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + mymake -C lib DESTDIR="${D}" install if multilib_is_native_abi ; then - emake -C programs \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + mymake -C programs DESTDIR="${D}" install - emake -C contrib/pzstd \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + mymake -C contrib/pzstd DESTDIR="${D}" install fi } diff --git a/app-arch/zstd/zstd-1.3.8.ebuild b/app-arch/zstd/zstd-1.3.8.ebuild index 51e41cc42c0..2704ae6a18f 100644 --- a/app-arch/zstd/zstd-1.3.8.ebuild +++ b/app-arch/zstd/zstd-1.3.8.ebuild @@ -23,47 +23,33 @@ src_prepare() { multilib_copy_sources } -multilib_src_compile() { - emake -C lib \ +mymake() { + emake \ CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ AR="$(tc-getAR)" \ PREFIX="${EPREFIX}/usr" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - libzstd libzstd.a libzstd.pc + "${@}" +} + +multilib_src_compile() { + mymake -C lib libzstd libzstd.a libzstd.pc if multilib_is_native_abi ; then - emake \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - HAVE_LZ4=$(usex lz4 1 0) \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd + mymake zstd - emake -C contrib/pzstd \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" + mymake -C contrib/pzstd fi } multilib_src_install() { - emake -C lib \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + mymake -C lib DESTDIR="${D}" install if multilib_is_native_abi ; then - emake -C programs \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + mymake -C programs DESTDIR="${D}" install - emake -C contrib/pzstd \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + mymake -C contrib/pzstd DESTDIR="${D}" install fi } diff --git a/app-arch/zstd/zstd-1.4.0.ebuild b/app-arch/zstd/zstd-1.4.0.ebuild index 51e41cc42c0..2704ae6a18f 100644 --- a/app-arch/zstd/zstd-1.4.0.ebuild +++ b/app-arch/zstd/zstd-1.4.0.ebuild @@ -23,47 +23,33 @@ src_prepare() { multilib_copy_sources } -multilib_src_compile() { - emake -C lib \ +mymake() { + emake \ CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ AR="$(tc-getAR)" \ PREFIX="${EPREFIX}/usr" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - libzstd libzstd.a libzstd.pc + "${@}" +} + +multilib_src_compile() { + mymake -C lib libzstd libzstd.a libzstd.pc if multilib_is_native_abi ; then - emake \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - HAVE_LZ4=$(usex lz4 1 0) \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd + mymake zstd - emake -C contrib/pzstd \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" + mymake -C contrib/pzstd fi } multilib_src_install() { - emake -C lib \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + mymake -C lib DESTDIR="${D}" install if multilib_is_native_abi ; then - emake -C programs \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + mymake -C programs DESTDIR="${D}" install - emake -C contrib/pzstd \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + mymake -C contrib/pzstd DESTDIR="${D}" install fi }