dev-libs/libressl: fix compilation on non-glibc systems

Reported-by: Philipp Ammann <[email protected]> Closes: gentoo#12078 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Stefan Strogin <[email protected]>
johu · May 24, 2019 · 5384e86 · 5384e86
1 parent 2177415
commit 5384e86
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch b/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch
@@ -0,0 +1,32 @@
+From a9f0b2143c3154da34b8798127263f6f11f61bd5 Mon Sep 17 00:00:00 2001
+From: Ishimoto Shinobu <[email protected]>
+Date: Tue, 21 May 2019 22:41:05 +0900
+Subject: [PATCH] avoid glibc
+
+cause problems on musl systems
+
+Upstream-Status: Backport
+[https://github.com/libressl-portable/portable/pull/529]
+Signed-off-by: Stefan Strogin <[email protected]>
+---
+ 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
+--- a/crypto/compat/getprogname_linux.c
++++ b/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
+
diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild
@@ -41,6 +41,7 @@ src_prepare() {
  fi
 
  eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+ eapply "${FILESDIR}"/${P}-non-glibc.patch
  eapply_user
 
  elibtoolize # for Solaris