Mercurial > vanilla

annotate crypto/libressl/patch-musl.patch @ 1203:9359bf16a80b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dev/cbindgen: remove RUSTFLAGS
author David Demelier <markand@malikania.fr>
date Thu, 07 Nov 2019 20:14:00 +0100
parents af3c84369341
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
645
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 From a747aacc23607c993cc481378782b2c7dd5bc53b Mon Sep 17 00:00:00 2001
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com>
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 Date: Tue, 21 May 2019 22:41:05 +0900
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 Subject: [PATCH 1/4] avoid glibc
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
5
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 cause problems on musl systems
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 ---
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 crypto/compat/getprogname_linux.c | 4 +---
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 1 file changed, 1 insertion(+), 3 deletions(-)
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
10
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 index 2c89743..4e7e31f 100644
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 --- crypto/compat/getprogname_linux.c
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 +++ crypto/compat/getprogname_linux.c
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 @@ -26,9 +26,7 @@ getprogname(void)
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 extern const char *__progname;
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 return __progname;
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 -#elif defined(__GLIBC__)
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 - return program_invocation_short_name;
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 #else
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 -#error "Cannot emulate getprogname"
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 + return program_invocation_short_name;
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 #endif
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 }
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 --
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 2.21.0
af3c84369341 crypto/libressl: fix build
David Demelier <markand@malikania.fr>
parents:
diff changeset
28