diff options
| author |   WANG Xuerui <xen0n@gentoo.org> | 2022-04-26 11:12:29 +0800 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-04-26 05:03:07 +0100 |
| commit | 245a61b5bb813af9ec9e89f9c8ca65d5c0e46aec (patch) | |
| tree | c42b8cc46803fc1e3ba40223125fd0f970ada6df /sys-apps | |
| parent | sys-apps/diffutils: avoid invoking autoconf (diff) | |
| download | gentoo-245a61b5bb813af9ec9e89f9c8ca65d5c0e46aec.tar.gz gentoo-245a61b5bb813af9ec9e89f9c8ca65d5c0e46aec.tar.bz2 gentoo-245a61b5bb813af9ec9e89f9c8ca65d5c0e46aec.zip | |
sys-apps/grep: 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: 07611b62174 ("sys-apps/grep: fix build on loong")
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/grep/files/loong-fix-build.patch | 18 | ||||
| -rw-r--r-- | sys-apps/grep/grep-3.7.ebuild | 6 |
2 files changed, 17 insertions, 7 deletions
diff --git a/sys-apps/grep/files/loong-fix-build.patch b/sys-apps/grep/files/loong-fix-build.patch index cd06fa8df5e4..e3b346dd92d3 100644 --- a/sys-apps/grep/files/loong-fix-build.patch +++ b/sys-apps/grep/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 <youbest@sina.com> 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 +@@ -35668,6 +35668,7 @@ else $as_nop + i?86 | x86_64 | \ + i860 | \ + ia64 | \ ++ loongarch* | \ + m32r | \ + m68* | \ + m88k | \ -- 2.17.2 diff --git a/sys-apps/grep/grep-3.7.ebuild b/sys-apps/grep/grep-3.7.ebuild index b8ca4022782f..6c582f7eb308 100644 --- a/sys-apps/grep/grep-3.7.ebuild +++ b/sys-apps/grep/grep-3.7.ebuild @@ -45,6 +45,12 @@ src_prepare() { src/egrep.sh || die #523898 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 ./config.hin ./configure || die + find . -name Makefile.in -exec touch {} + || die } src_configure() { |