commit: 3a193fa7dd4c98a4004a87aac61ce46414efa237
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 02:57:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 04:03:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a193fa7
sys-apps/diffutils: avoid invoking autoconf
Normally we'd just eautoreconf, but this is base-system and we cannot
depend on autoconf, so we have to patch the generated files ourselves.
This can go away once the loong fix patch is no longer necessary.
Fixes: 1bff2846eaa ("sys-apps/diffutils: fix build on loong")
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/diffutils/diffutils-3.8.ebuild | 10 ++++++++++
sys-apps/diffutils/files/loong-fix-build.patch | 18 +++++++++++-------
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 53a9433ee899..fe16ee36331a 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -28,6 +28,16 @@ PATCHES=(
"${FILESDIR}/loong-fix-build.patch"
)
+src_prepare() {
+ default
+
+ # touch generated files after patching m4, to avoid activating
maintainer
+ # mode
+ # remove when loong-fix-build.patch is no longer necessary
+ touch ./aclocal.m4 lib/config.hin ./configure || die
+ find . -name Makefile.in -exec touch {} + || die
+}
+
src_configure() {
use static && append-ldflags -static
diff --git a/sys-apps/diffutils/files/loong-fix-build.patch
b/sys-apps/diffutils/files/loong-fix-build.patch
index cd06fa8df5e4..2b16b47b7ee7 100644
--- a/sys-apps/diffutils/files/loong-fix-build.patch
+++ b/sys-apps/diffutils/files/loong-fix-build.patch
@@ -1,16 +1,10 @@
-From 34add045fd2ec3f1031dee961c4d9cc4285486a7 Mon Sep 17 00:00:00 2001
+[xen0n: this is
https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch
with change to generated file added as well.]
From: Sun Haiyong <[email protected]>
Date: Tue, 31 Aug 2021 11:11:52 +0800
Subject: [PATCH] stack-direction: Add support for loongarch CPU
* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch,
set "sv_cv_stack_direction" to "-1" .
----
- m4/stack-direction.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
-index 93287254b..e6c3284ce 100644
--- a/m4/stack-direction.m4
+++ b/m4/stack-direction.m4
@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
@@ -21,6 +15,16 @@ index 93287254b..e6c3284ce 100644
m32r | \
m68* | \
m88k | \
+--- a/configure
++++ b/configure
+@@ -34088,6 +34088,7 @@ else $as_nop
+ i?86 | x86_64 | \
+ i860 | \
+ ia64 | \
++ loongarch* | \
+ m32r | \
+ m68* | \
+ m88k | \
--
2.17.2
