From cb42e5518262235ed4e4dbff43179e0308114d6a Mon Sep 17 00:00:00 2001 From: Joel Barker Date: Fri, 30 Dec 2016 19:42:46 +0000 Subject: [PATCH] tweaks to allow compiling on linux --- depends/packages/googlemock.mk | 20 ++++++++++++++++++++ depends/packages/googletest.mk | 15 +++++++++++++++ src/crypto/equihash.cpp | 3 --- zcutil/build.sh | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 depends/packages/googlemock.mk create mode 100644 depends/packages/googletest.mk diff --git a/depends/packages/googlemock.mk b/depends/packages/googlemock.mk new file mode 100644 index 000000000..229dc3587 --- /dev/null +++ b/depends/packages/googlemock.mk @@ -0,0 +1,20 @@ +# url=https://github.com/google/googlemock/archive/release-1.7.0.tar.gz + +package=googlemock +$(package)_version=1.7.0 +$(package)_dependencies=googletest + +$(package)_download_path=https://github.com/google/$(package)/archive/ +$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_download_file=release-$($(package)_version).tar.gz +$(package)_sha256_hash=3f20b6acb37e5a98e8c4518165711e3e35d47deb6cdb5a4dd4566563b5efd232 + +define $(package)_build_cmds + $(MAKE) -C make GTEST_DIR='$(host_prefix)' CXXFLAGS='-fPIC' gmock-all.o +endef + + +define $(package)_stage_cmds + install -D ./make/gmock-all.o $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \ + cp -a ./include $($(package)_staging_dir)$(host_prefix)/include +endef diff --git a/depends/packages/googletest.mk b/depends/packages/googletest.mk new file mode 100644 index 000000000..5133e64a1 --- /dev/null +++ b/depends/packages/googletest.mk @@ -0,0 +1,15 @@ +package=googletest +$(package)_version=1.7.0 +$(package)_download_path=https://github.com/google/$(package)/archive/ +$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_download_file=release-$($(package)_version).tar.gz +$(package)_sha256_hash=f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc + +define $(package)_build_cmds + $(MAKE) -C make CXXFLAGS=-fPIC gtest.a +endef + +define $(package)_stage_cmds + install -D ./make/gtest.a $($(package)_staging_dir)$(host_prefix)/lib/libgtest.a && \ + cp -a ./include $($(package)_staging_dir)$(host_prefix)/include +endef diff --git a/src/crypto/equihash.cpp b/src/crypto/equihash.cpp index 784f520d1..f410fab25 100644 --- a/src/crypto/equihash.cpp +++ b/src/crypto/equihash.cpp @@ -43,9 +43,6 @@ #define __BIG_ENDIAN BIG_ENDIAN #define __LITTLE_ENDIAN LITTLE_ENDIAN #define __BYTE_ORDER BYTE_ORDER -#else -#include -#include #endif EhSolverCancelledException solver_cancelled; diff --git a/zcutil/build.sh b/zcutil/build.sh index c4823ed61..0778152ea 100755 --- a/zcutil/build.sh +++ b/zcutil/build.sh @@ -66,5 +66,5 @@ PREFIX="$(pwd)/depends/$BUILD/" HOST="$HOST" BUILD="$BUILD" "$MAKE" "$@" -C ./depends/ V=1 NO_QT=1 ./autogen.sh -CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g' +CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g -fopenmp' "$MAKE" "$@" V=1