svn commit: r514600 - in head/net-p2p/monero-cli: . files

[Piotr Kubaj]

Author: pkubaj
Date: Wed Oct 16 15:29:20 2019
New Revision: 514600
URL: https://svnweb.freebsd.org/changeset/ports/514600

Log:
  net-p2p/monero-cli: fix build on non-x86
  
  Checking battery status uses x86-only headers and functions. Remove this functionality to get it to build on other architectures.
  
  PR:             241230
  Approved by:    linimon (mentor), vd (maintainer)
  Pull Request:   https://github.com/monero-project/monero/pull/5984
  Differential Revision:  https://reviews.freebsd.org/D22027

Added:
  head/net-p2p/monero-cli/files/patch-src_cryptonote__basic_miner.cpp   (contents, props changed)
Modified:
  head/net-p2p/monero-cli/Makefile

Modified: head/net-p2p/monero-cli/Makefile
==============================================================================
--- head/net-p2p/monero-cli/Makefile	Wed Oct 16 15:26:12 2019	(r514599)
+++ head/net-p2p/monero-cli/Makefile	Wed Oct 16 15:29:20 2019	(r514600)
@@ -16,11 +16,7 @@ COMMENT=	Private, secure, untraceable, decentralised d
 
 LICENSE=	BSD3CLAUSE
 
-BROKEN_aarch64=		fails to compile: the clang compiler does not support -march=native
-BROKEN_armv6=		fails to compile: the clang compiler does not support -march=native
-BROKEN_armv7=		fails to compile: the clang compiler does not support -march=native
 BROKEN_i386=		fails to compile: register r15d is only available in 64-bit mode
-BROKEN_powerpc64=	fails to compile: the clang compiler does not support -march=native
 
 LIB_DEPENDS=	\
 		libboost_chrono.so:devel/boost-libs \

Added: head/net-p2p/monero-cli/files/patch-src_cryptonote__basic_miner.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/monero-cli/files/patch-src_cryptonote__basic_miner.cpp	Wed Oct 16 15:29:20 2019	(r514600)
@@ -0,0 +1,28 @@
+--- src/cryptonote_basic/miner.cpp.orig	2019-10-13 11:25:19 UTC
++++ src/cryptonote_basic/miner.cpp
+@@ -61,7 +61,9 @@
+   #include <devstat.h>
+   #include <errno.h>
+   #include <fcntl.h>
++#if defined(__amd64__ ) || defined(__i386__) || defined(__x86_64__)
+   #include <machine/apm_bios.h>
++#endif
+   #include <stdio.h>
+   #include <sys/resource.h>
+   #include <sys/sysctl.h>
+@@ -1082,6 +1084,7 @@ namespace cryptonote
+           return boost::logic::tribool(boost::logic::indeterminate);
+         }
+ 
++#if defined(__amd64__ ) || defined(__i386__) || defined(__x86_64__)
+         apm_info info;
+         if( ioctl(fd, APMIO_GETINFO, &info) == -1 ) {
+           close(fd);
+@@ -1116,6 +1119,7 @@ namespace cryptonote
+           << "unexpected ac-line status (" << info.ai_acline << ") and "
+           << "battery status (" << info.ai_batt_stat << ").");
+         return boost::logic::tribool(boost::logic::indeterminate);
++#endif
+       }
+       if( n != sizeof(ac) )
+       {