gnum4: 1.4.19 -> 1.4.20 (take 2) (#417460)

This commit is contained in:
Peder Bergebakken Sundt
2025-06-20 00:06:10 +02:00
committed by GitHub
2 changed files with 9 additions and 37 deletions
@@ -1,30 +0,0 @@
[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 <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" .
--- a/m4/stack-direction.m4
+++ b/m4/stack-direction.m4
@@ -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 | \
+ loongarch* | \
m32r | \
m68* | \
m88k | \
--
2.17.2
+9 -7
View File
@@ -9,17 +9,15 @@
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnum4";
version = "1.4.19";
version = "1.4.20";
src = fetchurl {
url = "mirror://gnu/m4/m4-${version}.tar.bz2";
sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg=";
url = "mirror://gnu/m4/m4-${finalAttrs.version}.tar.bz2";
hash = "sha256-rGmJ7l0q7YFzl4BjDMLOCX4qZUb+uWpKVNs31GoUUuQ=";
};
# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/m4/m4-1.4.19-r1.ebuild
patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./loong-fix-build.patch;
# this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
# necessary for FreeBSD code path in configure
postPatch =
@@ -35,6 +33,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Without the change the build fails on Darwin as https://hydra.nixos.org/build/300264726/nixlog/3/tail:
# clean-temp.c:235:14: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "format" ];
doCheck = false;
configureFlags = [
@@ -66,4 +68,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix ++ lib.platforms.windows;
};
}
})