diff options
| author | toonn <toonn@toonn.io> | 2021-07-27 20:06:16 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-11-24 15:17:13 -0800 |
| commit | 459dc34b2b69310b0e19c03b6b2320fd4ec7dd09 (patch) | |
| tree | 6262cc188cca929e18924aae74e0a8a34f1297ff | |
| parent | 5aa4c46dcd0da403f2bf25432c72aedaf5e9a202 (diff) | |
| download | nixpkgs-459dc34b2b69310b0e19c03b6b2320fd4ec7dd09.tar nixpkgs-459dc34b2b69310b0e19c03b6b2320fd4ec7dd09.tar.gz nixpkgs-459dc34b2b69310b0e19c03b6b2320fd4ec7dd09.tar.bz2 nixpkgs-459dc34b2b69310b0e19c03b6b2320fd4ec7dd09.tar.lz nixpkgs-459dc34b2b69310b0e19c03b6b2320fd4ec7dd09.tar.xz nixpkgs-459dc34b2b69310b0e19c03b6b2320fd4ec7dd09.tar.zst nixpkgs-459dc34b2b69310b0e19c03b6b2320fd4ec7dd09.zip | |
Libc: Define target in stdio too
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch | 26 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix | 5 |
2 files changed, 30 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch b/pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch new file mode 100644 index 00000000000..880c80883bf --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch @@ -0,0 +1,26 @@ +From 26a721ca68bb06cb815c49f4ac28bb9de8bb2cba Mon Sep 17 00:00:00 2001 +From: toonn <toonn@toonn.io> +Date: Tue, 27 Jul 2021 20:03:40 +0200 +Subject: [PATCH 2/2] Define TARGET_OS_EMBEDDED in stdio if not defined + +--- + include/stdio.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/stdio.h b/include/stdio.h +index d0cf7a5..487496e 100644 +--- a/include/stdio.h ++++ b/include/stdio.h +@@ -351,6 +351,9 @@ __END_DECLS + /* Additional functionality provided by: + * POSIX.2-1992 C Language Binding Option + */ ++#ifndef TARGET_OS_EMBEDDED ++# define TARGET_OS_EMBEDDED 0 ++#endif + #if TARGET_OS_EMBEDDED + #define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(ios_msg) + #else +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 542e0c3f438..5a8498a137d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -3,7 +3,10 @@ appleDerivation' stdenvNoCC { nativeBuildInputs = [ ed unifdef ]; - patches = [ ./0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch ]; + patches = [ + ./0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch + ./0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch + ]; # TODO: asl.h actually comes from syslog project now installPhase = '' |