svn commit: r482004 - head/net-p2p/monero-cli
Vasil Dimov
vd at FreeBSD.org
Sat Oct 13 17:57:28 UTC 2018
Author: vd
Date: Sat Oct 13 17:57:27 2018
New Revision: 482004
URL: https://svnweb.freebsd.org/changeset/ports/482004
Log:
net-p2p/monero-cli: fix compilation on FreeBSD < 12
-DMANUAL_SUBMODULES:BOOL=ON was mistakenly provided only on 12.x,
should be used always.
While I am here, pet portlint.
Modified:
head/net-p2p/monero-cli/Makefile
Modified: head/net-p2p/monero-cli/Makefile
==============================================================================
--- head/net-p2p/monero-cli/Makefile Sat Oct 13 17:55:13 2018 (r482003)
+++ head/net-p2p/monero-cli/Makefile Sat Oct 13 17:57:27 2018 (r482004)
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= monero-cli
-# To build from an arbitrary git commit comment the following two lines
+# To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present)
PORTVERSION= 0.13.0.2
-PORTREVISION= 0
DISTVERSIONPREFIX= v
# and uncomment the following two lines
#PORTVERSION= 0
@@ -42,6 +41,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/rapidjson/document
USES= cmake compiler:c++11-lib pkgconfig readline ssl
USE_GITHUB= yes
+
GH_ACCOUNT= monero-project
GH_PROJECT= monero
.if defined(PKGNAMESUFFIX)
@@ -62,7 +62,6 @@ DOXYGEN_CMAKE_BOOL= BUILD_DOCUMENTATION
# See Bug 226996 - net-p2p/monero-cli: fails to link with lld as the system linker
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226996
.if ${OSVERSION} >= 1200000
-ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc powerpc64
.if ${ARCH} == aarch64
LD_EMULATION= aarch64elf
@@ -76,9 +75,11 @@ LD_EMULATION= elf32ppc
LD_EMULATION= elf64ppc
.endif
-CMAKE_ARGS+= -DLD_RAW_FLAGS:STRING=-m${LD_EMULATION} \
- -DMANUAL_SUBMODULES:BOOL=ON
+CMAKE_ARGS+= -DLD_RAW_FLAGS:STRING=-m${LD_EMULATION}
+
.endif
+
+CMAKE_ARGS+= -DMANUAL_SUBMODULES:BOOL=ON
USE_RC_SUBR= monerod
More information about the svn-ports-all
mailing list