Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Raspberry Pi compile compatibility #73

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Raspberry Pi compile compatibility #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions armoryengine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@ def GetSystemDetails():

# Get CPU name
cpuinfo = subprocess_check_output(['cat','/proc/cpuinfo'])
out.CpuStr = "Unknown"
for line in cpuinfo.split('\n'):
if line.strip().lower().startswith('model name'):
out.CpuStr = line.split(':')[1].strip()
Expand Down
11 changes: 10 additions & 1 deletion cppForSwig/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
COMPILER = g++
#COMPILER_OPTS = -c -g -Wall -fPIC -D_DEBUG
COMPILER_OPTS = -c -O2 -pipe -fPIC
EGREP = egrep

#**************************************************************************
LINKER = g++
Expand All @@ -12,7 +13,15 @@ DEPSDIR ?= /usr
INCLUDE_OPTS += -Icryptopp -DUSE_CRYPTOPP -D__STDC_LIMIT_MACROS
LIBRARY_OPTS += -lpthread
SWIG_OPTS += -c++ -python -classic -threads
PYVER += `python2 -c 'import sys; print str(sys.version_info[0]) + "." + str(sys.version_info[1])'`

PYVER_IS_VER2 = $(shell python -c 'import sys; print str(sys.version_info[0]) + "." + str(sys.version_info[1])' | $(EGREP) -c "^2\.")

ifneq ($(PYVER_IS_VER2),0) # use python instead of python2, if python returns a version of 2.x
PYVER += `python -c 'import sys; print str(sys.version_info[0]) + "." + str(sys.version_info[1])'`
else
PYVER += `python2 -c 'import sys; print str(sys.version_info[0]) + "." + str(sys.version_info[1])'`
endif



UNAME := $(shell uname)
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/cryptopp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ MKDIR = mkdir
EGREP = egrep
UNAME = $(shell uname)
ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64")
IS_SUN_CC = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun")

# Default prefix for make install
ifeq ($(PREFIX),)
Expand All @@ -27,7 +28,6 @@ ifeq ($(ISX86),1)
GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])")
INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)")
ICC111_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0-9]|1[2-9]|11\.[1-9])")
IS_SUN_CC = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun")
GAS210_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])")
GAS217_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])")
GAS219_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])")
Expand Down