From owner-svn-ports-all@freebsd.org Mon Oct 21 14:40:34 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5677E15912A; Mon, 21 Oct 2019 14:40:34 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46xfSf1gd4z4LsM; Mon, 21 Oct 2019 14:40:34 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1CC2425619; Mon, 21 Oct 2019 14:40:34 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9LEeXGE040879; Mon, 21 Oct 2019 14:40:33 GMT (envelope-from vd@FreeBSD.org) Received: (from vd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9LEeXR9040878; Mon, 21 Oct 2019 14:40:33 GMT (envelope-from vd@FreeBSD.org) Message-Id: <201910211440.x9LEeXR9040878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org using -f From: Vasil Dimov Date: Mon, 21 Oct 2019 14:40:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r515111 - branches/2019Q4/net-p2p/qtum X-SVN-Group: ports-branches X-SVN-Commit-Author: vd X-SVN-Commit-Paths: branches/2019Q4/net-p2p/qtum X-SVN-Commit-Revision: 515111 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2019 14:40:34 -0000 Author: vd Date: Mon Oct 21 14:40:33 2019 New Revision: 515111 URL: https://svnweb.freebsd.org/changeset/ports/515111 Log: MFH: r514348 net-p2p/qtum: fix compilation on FreeBSD 11.x Approved by: portmgr (build fix blanket) Modified: branches/2019Q4/net-p2p/qtum/Makefile Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/net-p2p/qtum/Makefile ============================================================================== --- branches/2019Q4/net-p2p/qtum/Makefile Mon Oct 21 14:34:11 2019 (r515110) +++ branches/2019Q4/net-p2p/qtum/Makefile Mon Oct 21 14:40:33 2019 (r515111) @@ -27,7 +27,6 @@ USES= autoreconf bdb:5+ compiler:c++14-lang gmake lib GNU_CONFIGURE= yes CONFIGURE_ENV+= BDB_CFLAGS="-I${BDB_INCLUDE_DIR}" \ BDB_LIBS="-L${BDB_LIB_DIR} -l${BDB_LIB_CXX_NAME}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" # * Man pages have not been adjusted after cloning the Bitcoin code base. # They are the old Bitcoin man pages, so do not install them. @@ -60,6 +59,17 @@ CONFIGURE_ENV+= CRYPTO_CFLAGS="-I${OPENSSLINC}" \ CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ SSL_CFLAGS="-I${OPENSSLINC}" \ SSL_LIBS="-L${OPENSSLLIB} -lssl" +.endif + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 +# Force PIC on FreeBSD 11.x because otherwise linking fails: +# /usr/bin/ld: qtum_cli-bitcoin-cli.o: relocation R_X86_64_32 against `a local +# symbol' can not be used when making a shared object; recompile with -fPIC +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -fPIC -DPIC" +post-patch: + ${SED} -i '' -e 's/AC_SUBST(PIE_FLAGS)//' ${WRKSRC}/configure.ac +.else +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" .endif .include