Mercurial > vanilla
changeset 645:af3c84369341
crypto/libressl: fix build
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 27 Jul 2019 08:58:45 +0200 |
parents | 4ab57189a2b5 |
children | 5131a8ac0815 |
files | crypto/libressl/libressl.sh crypto/libressl/patch-musl.patch |
diffstat | 2 files changed, 29 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/crypto/libressl/libressl.sh Sat Jul 27 08:51:12 2019 +0200 +++ b/crypto/libressl/libressl.sh Sat Jul 27 08:58:45 2019 +0200 @@ -32,6 +32,7 @@ tar xvf $PKGNAME-$PKGVERSION.tar.gz cd $PKGNAME-$PKGVERSION + patch -p0 < ../patch-musl.patch mkdir build && cd build cmake .. \ -DBUILD_SHARED_LIBS=On \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crypto/libressl/patch-musl.patch Sat Jul 27 08:58:45 2019 +0200 @@ -0,0 +1,28 @@ +From a747aacc23607c993cc481378782b2c7dd5bc53b Mon Sep 17 00:00:00 2001 +From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com> +Date: Tue, 21 May 2019 22:41:05 +0900 +Subject: [PATCH 1/4] avoid glibc + +cause problems on musl systems +--- + crypto/compat/getprogname_linux.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c +index 2c89743..4e7e31f 100644 +--- crypto/compat/getprogname_linux.c ++++ crypto/compat/getprogname_linux.c +@@ -26,9 +26,7 @@ getprogname(void) + #if defined(__ANDROID_API__) && __ANDROID_API__ < 21 + extern const char *__progname; + return __progname; +-#elif defined(__GLIBC__) +- return program_invocation_short_name; + #else +-#error "Cannot emulate getprogname" ++ return program_invocation_short_name; + #endif + } +-- +2.21.0 +