[gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     0b9f8e012a51eecd3df1a86b4ca639de85537e33
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 15:40:49 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 15:41:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0b9f8e01

Bump strace to v5.11

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/software.sh    | 2 +-
 gkbuilds/strace.gkbuild | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index e938584..291bad4 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -186,7 +186,7 @@ GKPKG_POPT_BINPKG="${GKPKG_POPT_BINPKG:-%%CACHE%%/popt-${GKPKG_POPT_PV}-%%ARCH%%
 
 GKPKG_STRACE_PN="strace"
 GKPKG_STRACE_PV="${GKPKG_STRACE_PV:-VERSION_STRACE}"
-GKPKG_STRACE_DEPS=""
+GKPKG_STRACE_DEPS="libaio"
 GKPKG_STRACE_SRCTAR="${GKPKG_STRACE_SRCTAR:-${DISTDIR}/strace-${GKPKG_STRACE_PV}.tar.xz}"
 GKPKG_STRACE_SRCDIR="${GKPKG_STRACE_SRCDIR:-strace-${GKPKG_STRACE_PV}}"
 GKPKG_STRACE_BINPKG="${GKPKG_STRACE_BINPKG:-%%CACHE%%/strace-${GKPKG_STRACE_PV}-%%ARCH%%.tar.xz}"

diff --git a/gkbuilds/strace.gkbuild b/gkbuilds/strace.gkbuild
index 62399ce..d32a4b7 100644
--- a/gkbuilds/strace.gkbuild
+++ b/gkbuilds/strace.gkbuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {
 	append-ldflags -static -pthread
-	export ac_cv_header_libaio_h=yes
 
 	local myconf=(
+		--disable-gcc-Werror
 		--enable-mpers=check
+		--enable-static
 		--without-libunwind
 		--without-libdw
 	)
@@ -19,8 +20,8 @@ src_configure() {
 src_install() {
 	mkdir -p "${D}"/usr/bin || die "Failed to create '${D}/usr/bin'!"
 
-	cp -a strace "${D}"/usr/bin/ \
-		|| die "Failed to copy '${S}/strace' to '${D}/usr/bin/'!"
+	cp -a src/strace "${D}"/usr/bin/ \
+		|| die "Failed to copy '${S}/src/strace' to '${D}/usr/bin/'!"
 
 	"${STRIP}" --strip-all "${D}"/usr/bin/strace \
 		|| die "Failed to strip '${D}/usr/bin/strace'!"