diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-28 13:21:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-28 13:21:42 +0300 |
| commit | b2ef7956b631118c98f2e3de2f7594f6f844230c (patch) | |
| tree | 480e7be099f871d7a7616f392a3a548e7491e336 /pkgs/tools | |
| parent | c0f57c1d2359234280f2b6d47ff220f58c19c53d (diff) | |
| parent | 15e3a50bd354dfa561eaae222159832829834f65 (diff) | |
Merge pull request #227560 from jackyliu16/loongnix-commit
lib.platforms.loongarch64: init
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/text/gnugrep/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/text/gnugrep/sigsegv-loongarch.patch | 31 |
2 files changed, 36 insertions, 2 deletions
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index efb3be1c8fb2d..fc285bb4c4dea 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, libiconv, perl }: +{ lib, stdenv, fetchurl, pcre, libiconv, perl, autoreconfHook }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -16,8 +16,11 @@ stdenv.mkDerivation { sha256 = "0g42svbc1nq5bamxfj6x7320wli4dlj86padk0hwgbk04hqxl42w"; }; + # https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=b50c6442e43d79471a31a2a202d3e50c0557446f + patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./sigsegv-loongarch.patch; + # Perl is needed for testing - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl ] ++ lib.optional stdenv.hostPlatform.isLoongArch64 autoreconfHook; outputs = [ "out" "info" ]; # the man pages are rather small buildInputs = [ pcre libiconv ]; diff --git a/pkgs/tools/text/gnugrep/sigsegv-loongarch.patch b/pkgs/tools/text/gnugrep/sigsegv-loongarch.patch new file mode 100644 index 0000000000000..19bb2c1d70ca5 --- /dev/null +++ b/pkgs/tools/text/gnugrep/sigsegv-loongarch.patch @@ -0,0 +1,31 @@ +From b50c6442e43d79471a31a2a202d3e50c0557446f Mon Sep 17 00:00:00 2001 +From: Sun Haiyong <youbest@sina.com> +Date: Sat, 4 Sep 2021 15:06:43 +0200 +Subject: sigsegv: Improve cross-compilation support for LoongArch CPU. + +* m4/stack-direction.m4 (SV_STACK_DIRECTION): Assume the stack grows +down on LoongArch. +--- + m4/stack-direction.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 +index 9328725..e682be9 100644 +--- a/m4/stack-direction.m4 ++++ b/m4/stack-direction.m4 +@@ -1,4 +1,4 @@ +-# stack-direction.m4 serial 7 ++# stack-direction.m4 serial 8 + dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. + dnl This file is free software, distributed under the terms of the GNU + dnl General Public License. As a special exception to the GNU General +@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION], + i?86 | x86_64 | \ + i860 | \ + ia64 | \ ++ loongarch* | \ + m32r | \ + m68* | \ + m88k | \ +-- +cgit v1.1 |