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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E71615808E for ; Tue, 26 Apr 2022 04:03:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83E5DE07A5; Tue, 26 Apr 2022 04:03:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6FC7E0788 for ; Tue, 26 Apr 2022 04:03:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0BC93341A93 for ; Tue, 26 Apr 2022 04:03:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 692AC3F1 for ; Tue, 26 Apr 2022 04:03:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650945788.4abfea67ec79d3983c7221b0d755f5316eb5d59b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/m4/files/, sys-devel/m4/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/m4/files/loong-fix-build.patch sys-devel/m4/m4-1.4.19.ebuild X-VCS-Directories: sys-devel/m4/ sys-devel/m4/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4abfea67ec79d3983c7221b0d755f5316eb5d59b X-VCS-Branch: master Date: Tue, 26 Apr 2022 04:03:20 +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: 7f4c5077-ddfd-4f51-a065-8d1e803b2b42 X-Archives-Hash: 192c5dd977ee8f7fa5fc170a6ba28738 commit: 4abfea67ec79d3983c7221b0d755f5316eb5d59b Author: WANG Xuerui gentoo org> AuthorDate: Tue Apr 26 03:20:21 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 26 04:03:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4abfea67 sys-devel/m4: 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: 43dd58338de ("sys-devel/m4: fix build on loong") Closes: https://github.com/gentoo/gentoo/pull/25195 Closes: https://github.com/gentoo/gentoo/pull/25205 Signed-off-by: WANG Xuerui gentoo.org> Signed-off-by: Sam James gentoo.org> sys-devel/m4/files/loong-fix-build.patch | 20 ++++++++++++-------- sys-devel/m4/m4-1.4.19.ebuild | 10 ++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/sys-devel/m4/files/loong-fix-build.patch b/sys-devel/m4/files/loong-fix-build.patch index cd06fa8df5e4..d5243357928b 100644 --- a/sys-devel/m4/files/loong-fix-build.patch +++ b/sys-devel/m4/files/loong-fix-build.patch @@ -1,19 +1,23 @@ -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 line number tweak, and change to generated file added as well.] From: Sun Haiyong 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], +@@ -31,6 +31,7 @@ AC_DEFUN([SV_STACK_DIRECTION], + i?86 | x86_64 | \ + i860 | \ + ia64 | \ ++ loongarch* | \ + m32r | \ + m68* | \ + m88k | \ +--- a/configure ++++ b/configure +@@ -46399,6 +46399,7 @@ else $as_nop i?86 | x86_64 | \ i860 | \ ia64 | \ diff --git a/sys-devel/m4/m4-1.4.19.ebuild b/sys-devel/m4/m4-1.4.19.ebuild index 8c29c255fee5..e3ceb0429850 100644 --- a/sys-devel/m4/m4-1.4.19.ebuild +++ b/sys-devel/m4/m4-1.4.19.ebuild @@ -51,6 +51,16 @@ src_unpack() { default } +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() { local -a myeconfargs=( --enable-changeword