diff options
| author | Will Dietz <w@wdtz.org> | 2017-12-07 12:47:37 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:44 -0600 |
| commit | 6c2e8b36cf1b8399a00b362411f19aa05677f7cf (patch) | |
| tree | f68c9ca609e8cdc9b6e79aed03aab2a6dff4cd63 /pkgs/development/libraries/libnsl | |
| parent | 8fa7634819a8be91cec4ace7f64ac77e1c1caedb (diff) | |
| download | nixpkgs-6c2e8b36cf1b8399a00b362411f19aa05677f7cf.tar nixpkgs-6c2e8b36cf1b8399a00b362411f19aa05677f7cf.tar.gz nixpkgs-6c2e8b36cf1b8399a00b362411f19aa05677f7cf.tar.bz2 nixpkgs-6c2e8b36cf1b8399a00b362411f19aa05677f7cf.tar.lz nixpkgs-6c2e8b36cf1b8399a00b362411f19aa05677f7cf.tar.xz nixpkgs-6c2e8b36cf1b8399a00b362411f19aa05677f7cf.tar.zst nixpkgs-6c2e8b36cf1b8399a00b362411f19aa05677f7cf.zip | |
libnsl: Add alpine patches to fix w/musl
Diffstat (limited to 'pkgs/development/libraries/libnsl')
| -rw-r--r-- | pkgs/development/libraries/libnsl/cdefs.patch | 30 | ||||
| -rw-r--r-- | pkgs/development/libraries/libnsl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libnsl/nis_h.patch | 45 |
3 files changed, 77 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libnsl/cdefs.patch b/pkgs/development/libraries/libnsl/cdefs.patch new file mode 100644 index 00000000000..dbbe800a347 --- /dev/null +++ b/pkgs/development/libraries/libnsl/cdefs.patch @@ -0,0 +1,30 @@ +--- a/src/rpcsvc/nislib.h ++++ b/src/rpcsvc/nislib.h +@@ -19,6 +19,7 @@ + #ifndef __RPCSVC_NISLIB_H__ + #define __RPCSVC_NISLIB_H__ + ++#include <sys/cdefs.h> + #include <features.h> + + __BEGIN_DECLS +--- a/src/rpcsvc/ypclnt.h ++++ b/src/rpcsvc/ypclnt.h +@@ -20,6 +20,7 @@ + #ifndef __RPCSVC_YPCLNT_H__ + #define __RPCSVC_YPCLNT_H__ + ++#include <sys/cdefs.h> + #include <features.h> + + /* Some defines */ +--- a/src/rpcsvc/ypupd.h ++++ b/src/rpcsvc/ypupd.h +@@ -33,6 +33,7 @@ + #ifndef __RPCSVC_YPUPD_H__ + #define __RPCSVC_YPUPD_H__ + ++#include <sys/cdefs.h> + #include <features.h> + + #include <rpc/rpc.h> diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index d4af280c3cd..9e8a46b2e6b 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libtirpc ]; + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ./cdefs.patch ./nis_h.patch ]; + meta = with stdenv.lib; { description = "Client interface library for NIS(YP) and NIS+"; homepage = https://github.com/thkukuk/libnsl; diff --git a/pkgs/development/libraries/libnsl/nis_h.patch b/pkgs/development/libraries/libnsl/nis_h.patch new file mode 100644 index 00000000000..199259df2e8 --- /dev/null +++ b/pkgs/development/libraries/libnsl/nis_h.patch @@ -0,0 +1,45 @@ +--- a/src/rpcsvc/nis.h ++++ b/src/rpcsvc/nis.h +@@ -32,6 +32,7 @@ + #ifndef _RPCSVC_NIS_H + #define _RPCSVC_NIS_H 1 + ++#include <sys/cdefs.h> + #include <features.h> + #include <rpc/rpc.h> + #include <rpcsvc/nis_tags.h> +@@ -56,6 +57,34 @@ + * <kukuk@suse.de> + */ + ++#ifndef rawmemchr ++#define rawmemchr(s,c) memchr((s),(size_t)-1,(c)) ++#endif ++ ++#ifndef __asprintf ++#define __asprintf asprintf ++#endif ++ ++#ifndef __mempcpy ++#define __mempcpy mempcpy ++#endif ++ ++#ifndef __strtok_r ++#define __strtok_r strtok_r ++#endif ++ ++#ifndef __always_inline ++#define __always_inline __attribute__((__always_inline__)) ++#endif ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(exp) ({ \ ++typeof (exp) _rc; \ ++ do { \ ++ _rc = (exp); \ ++ } while (_rc == -1 && errno == EINTR); \ ++ _rc; }) ++#endif + + #ifndef __nis_object_h + #define __nis_object_h |