From 00a7437ad818e5f06782cba4694e7f53d7efe20d Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Tue, 23 Feb 2021 07:54:40 -0800 Subject: [PATCH] Add -fPIC to make wolfssl happy on Ubuntu 16.04 --- depends/packages/wolfssl.mk | 2 +- src/Makefile.am | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/depends/packages/wolfssl.mk b/depends/packages/wolfssl.mk index 07f235838..d1e9ac08c 100644 --- a/depends/packages/wolfssl.mk +++ b/depends/packages/wolfssl.mk @@ -50,7 +50,7 @@ endef #endef define $(package)_build_cmds - $(MAKE) -j1 src/libwolfssl.la + $(MAKE) CPPFLAGS='-fPIC' -j1 src/libwolfssl.la endef define $(package)_stage_cmds diff --git a/src/Makefile.am b/src/Makefile.am index 1eb56ec24..0711b52cc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# Copyright 2016-2020 The Hush developers +# Copyright 2016-2021 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html @@ -483,8 +483,8 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # komodod binary # komodod_SOURCES = bitcoind.cpp -komodod_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -komodod_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +komodod_CPPFLAGS = -fPIC $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +komodod_CXXFLAGS = -fPIC $(AM_CXXFLAGS) $(PIE_FLAGS) komodod_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS