diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-24 21:34:54 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-24 21:34:54 -0500 |
| commit | 09e57636f895193a8e5438fb38b8498073f6a7d2 (patch) | |
| tree | e8c5e48d7492f91e58a461af65ad3a8d64f53c24 /pkgs/development/libraries/libgpg-error | |
| parent | 529ea1f921abeebea4809e8a644bfb53442bd7c8 (diff) | |
libgpg-error: Add RISC-V patch.
Diffstat (limited to 'pkgs/development/libraries/libgpg-error')
| -rw-r--r-- | pkgs/development/libraries/libgpg-error/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libgpg-error/riscv.patch | 54 |
2 files changed, 57 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 9511d2314249a..5c5824a9930ca 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages, fetchurl, gettext -, genPosixLockObjOnly ? false +, hostPlatform, genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = stdenv.lib.optionalAttrs genPosixLockObjOnly { buildPhase = '' @@ -24,6 +24,8 @@ in stdenv.mkDerivation (rec { sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; }; + patches = if hostPlatform.isRiscV then ./riscv.patch else null; + postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/libraries/libgpg-error/riscv.patch b/pkgs/development/libraries/libgpg-error/riscv.patch new file mode 100644 index 0000000000000..afc3b9993a439 --- /dev/null +++ b/pkgs/development/libraries/libgpg-error/riscv.patch @@ -0,0 +1,54 @@ +commit b3e9ec5626d474c58e683a41d09576297d4acd3d +Author: Shea Levy <shea@shealevy.com> +Date: Sat Feb 24 21:12:44 2018 -0500 + + syscfg: Add lock-obj-pub file for riscv64-unknown-linux-gnu. + + * src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h: new. + * src/Makefile.am (lock_obj_pub): Add it. + + Signed-off-by: Shea Levy <shea@shealevy.com> + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4446612..5a8cc43 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -65,6 +65,7 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ ++ syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ + syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ +diff --git a/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h +new file mode 100644 +index 0000000..8aab9d6 +--- /dev/null ++++ b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h +@@ -0,0 +1,25 @@ ++## lock-obj-pub.riscv64-unknown-linux-gnu.h ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++typedef struct ++{ ++ long _vers; ++ union { ++ volatile char _priv[40]; ++ long _x_align; ++ long *_xp_align; ++ } u; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0}}} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## |