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 88A04138359 for ; Tue, 7 Jul 2020 06:48:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACEEBE08C9; Tue, 7 Jul 2020 06:48:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 8F5F1E08C9 for ; Tue, 7 Jul 2020 06:48:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D7CAC34EFA0 for ; Tue, 7 Jul 2020 06:48:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A19602A4 for ; Tue, 7 Jul 2020 06:48:54 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1594104531.cf3b25e0297bae02bc8aeeb43b45f497407913f6.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/dtc/dtc-1.5.0-r2.ebuild sys-apps/dtc/dtc-9999.ebuild X-VCS-Directories: sys-apps/dtc/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: cf3b25e0297bae02bc8aeeb43b45f497407913f6 X-VCS-Branch: master Date: Tue, 7 Jul 2020 06:48:54 +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: 13f52e64-a36c-45a3-b314-09b09b03e207 X-Archives-Hash: 573cc82b23ed657a8e4c9c5c4b25b515 commit: cf3b25e0297bae02bc8aeeb43b45f497407913f6 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Jul 7 06:48:28 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Jul 7 06:48:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf3b25e0 sys-apps/dtc: avoid using environment for make options Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sergei Trofimovich gentoo.org> .../dtc/{dtc-9999.ebuild => dtc-1.5.0-r2.ebuild} | 36 ++++++++++++++++++---- sys-apps/dtc/dtc-9999.ebuild | 34 ++++++++++++++++---- 2 files changed, 58 insertions(+), 12 deletions(-) diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-1.5.0-r2.ebuild similarity index 70% copy from sys-apps/dtc/dtc-9999.ebuild copy to sys-apps/dtc/dtc-1.5.0-r2.ebuild index a481c0ee0bc..d995690db9c 100644 --- a/sys-apps/dtc/dtc-9999.ebuild +++ b/sys-apps/dtc/dtc-1.5.0-r2.ebuild @@ -35,8 +35,29 @@ DOCS=" PATCHES=( "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch + "${FILESDIR}"/${PN}-1.5.0-fdt_check_full-visibility.patch + "${FILESDIR}"/${PN}-1.5.0-gcc-10.patch ) +_emake() { + # valgrind is used only in 'make checkm' + emake \ + NO_YAML=$(usex !yaml 1 0) \ + NO_VALGRIND=1 \ + \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + \ + V=1 \ + \ + PREFIX="${EPREFIX}/usr" \ + \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + \ + "$@" +} + src_prepare() { default @@ -45,18 +66,21 @@ src_prepare() { -e '/^CPPFLAGS =/s:=:+=:' \ -e 's:-Werror::' \ -e 's:-g -Os::' \ - -e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \ - -e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \ Makefile || die tc-export AR CC PKG_CONFIG - export V=1 - export NO_YAML=$(usex !yaml 1 0) - export NO_VALGRIND=1 # used only in 'make checkm' +} + +src_compile() { + _emake +} + +src_test() { + _emake check } src_install() { - default + _emake DESTDIR="${D}" install use static-libs || find "${ED}" -name '*.a' -delete } diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild index a481c0ee0bc..a24d2e224a3 100644 --- a/sys-apps/dtc/dtc-9999.ebuild +++ b/sys-apps/dtc/dtc-9999.ebuild @@ -37,6 +37,25 @@ PATCHES=( "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch ) +_emake() { + # valgrind is used only in 'make checkm' + emake \ + NO_YAML=$(usex !yaml 1 0) \ + NO_VALGRIND=1 \ + \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + \ + V=1 \ + \ + PREFIX="${EPREFIX}/usr" \ + \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + \ + "$@" +} + src_prepare() { default @@ -45,18 +64,21 @@ src_prepare() { -e '/^CPPFLAGS =/s:=:+=:' \ -e 's:-Werror::' \ -e 's:-g -Os::' \ - -e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \ - -e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \ Makefile || die tc-export AR CC PKG_CONFIG - export V=1 - export NO_YAML=$(usex !yaml 1 0) - export NO_VALGRIND=1 # used only in 'make checkm' +} + +src_compile() { + _emake +} + +src_test() { + _emake check } src_install() { - default + _emake DESTDIR="${D}" install use static-libs || find "${ED}" -name '*.a' -delete }