From 75fd86cf1848c02c739ed865a41736afb9bdc66a Mon Sep 17 00:00:00 2001 From: rsadowski Date: Tue, 23 Oct 2018 15:26:42 +0000 Subject: [PATCH] unbreak lld Do not set "-fPIE -pie" flags by AX_CHECK_LINK_FLAG(). "looks fine" neddy@ --- net/bitcoin/Makefile | 3 ++- net/bitcoin/patches/patch-configure_ac | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 net/bitcoin/patches/patch-configure_ac diff --git a/net/bitcoin/Makefile b/net/bitcoin/Makefile index bd77488ead6..bcd132ddc34 100644 --- a/net/bitcoin/Makefile +++ b/net/bitcoin/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.7 2018/10/09 07:08:17 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.8 2018/10/23 15:26:42 rsadowski Exp $ COMMENT = P2P payment system GH_ACCOUNT = bitcoin GH_PROJECT = bitcoin GH_TAGNAME = v0.17.0 +REVISION = 0 SHARED_LIBS += bitcoinconsensus 1.0 # 0.0 SHARED_LIBS += secp256k1 0.0 # 0.0 diff --git a/net/bitcoin/patches/patch-configure_ac b/net/bitcoin/patches/patch-configure_ac new file mode 100644 index 00000000000..227e2aad518 --- /dev/null +++ b/net/bitcoin/patches/patch-configure_ac @@ -0,0 +1,15 @@ +$OpenBSD: patch-configure_ac,v 1.1 2018/10/23 15:26:42 rsadowski Exp $ + +We already uses PIE as default. Unbreak with lld + +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -710,7 +710,6 @@ if test x$use_hardening != xno; then + AX_CHECK_LINK_FLAG([[-Wl,--high-entropy-va]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--high-entropy-va"]) + AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"]) + AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"]) +- AX_CHECK_LINK_FLAG([[-fPIE -pie]], [PIE_FLAGS="-fPIE"; HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"],, [[$CXXFLAG_WERROR]]) + + case $host in + *mingw*)