cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/openssl-devel: unbreak on i386 via atomic stub

Browse Source 
Submitted by:	jbeich
This commit is contained in:
Bernard Spil 2021-08-01 10:15:47 +00:00
parent 5f94563da5
commit 85219598c4
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/openssl-devel/Makefile
View File

@ -17,8 +17,6 @@ CONFLICTS_INSTALL= libressl-[0-9]* \
libressl-devel-[0-9]* \
openssl-[0-9]*
BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= config
CONFIGURE_ENV= PERL="${PERL}"

20
security/openssl-devel/files/patch-crypto_threads__pthread.c Normal file
View File

@ -0,0 +1,20 @@
Drop after FreeBSD 13.0/12.2 EOL around 2022-05-30
ld: error: undefined symbol: __atomic_is_lock_free
>>> referenced by threads_pthread.c
>>> libfips-lib-threads_pthread.o:(CRYPTO_atomic_or) in archive providers/libfips.a
>>> referenced by threads_pthread.c
>>> libfips-lib-threads_pthread.o:(CRYPTO_atomic_load) in archive providers/libfips.a
--- crypto/threads_pthread.c.orig 2021-07-29 14:50:29 UTC
+++ crypto/threads_pthread.c
@@ -15,6 +15,9 @@
#if defined(__sun)
# include <atomic.h>
+#elif defined(__clang__) && defined(__i386__) && __clang_major__ < 12
+/* Until https://github.com/llvm/llvm-project/commit/00530dee5d12 */
+#define __atomic_is_lock_free(size, ptr) ((void)(ptr), size <= sizeof(void *))
#endif
#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)