From 09e57636f895193a8e5438fb38b8498073f6a7d2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 24 Feb 2018 21:34:54 -0500
Subject: [PATCH] libgpg-error: Add RISC-V patch.

---
 .../libraries/libgpg-error/default.nix        |  4 +-
 .../libraries/libgpg-error/riscv.patch        | 54 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libgpg-error/riscv.patch

diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 9511d2314249..5c5824a9930c 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 000000000000..afc3b9993a43
--- /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:
++##