[gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     cf3b25e0297bae02bc8aeeb43b45f497407913f6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  7 06:48:28 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> 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 <slyfox <AT> 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
 }