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 5EEB815808E for ; Tue, 26 Apr 2022 04:03:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EF9EE07B2; 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 C5666E077A 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 EBAFF341A89 for ; Tue, 26 Apr 2022 04:03:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 417F775 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: <1650945786.3a193fa7dd4c98a4004a87aac61ce46414efa237.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/diffutils/diffutils-3.8.ebuild sys-apps/diffutils/files/loong-fix-build.patch X-VCS-Directories: sys-apps/diffutils/ sys-apps/diffutils/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3a193fa7dd4c98a4004a87aac61ce46414efa237 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: 732ed194-dfec-4171-9562-46f1ebdc2a7c X-Archives-Hash: 6a381073a8e55db24cb80eef5e700e65 commit: 3a193fa7dd4c98a4004a87aac61ce46414efa237 Author: WANG Xuerui gentoo org> AuthorDate: Tue Apr 26 02:57:35 2022 +0000 Commit: Sam James gentoo 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 gentoo.org> Signed-off-by: Sam James 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 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