Skip to content

Commit

Permalink
tweaks to allow compiling on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
j-cimb-barker committed Dec 30, 2016
1 parent 9c511c5 commit cb42e55
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 4 deletions.
20 changes: 20 additions & 0 deletions depends/packages/googlemock.mk
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions depends/packages/googletest.mk
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions src/crypto/equihash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion zcutil/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit cb42e55

Please sign in to comment.