tweaks to allow compiling on linux
This commit is contained in:
20
depends/packages/googlemock.mk
Normal file
20
depends/packages/googlemock.mk
Normal file
@@ -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
depends/packages/googletest.mk
Normal file
15
depends/packages/googletest.mk
Normal file
@@ -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
|
||||||
@@ -43,9 +43,6 @@
|
|||||||
#define __BIG_ENDIAN BIG_ENDIAN
|
#define __BIG_ENDIAN BIG_ENDIAN
|
||||||
#define __LITTLE_ENDIAN LITTLE_ENDIAN
|
#define __LITTLE_ENDIAN LITTLE_ENDIAN
|
||||||
#define __BYTE_ORDER BYTE_ORDER
|
#define __BYTE_ORDER BYTE_ORDER
|
||||||
#else
|
|
||||||
#include
|
|
||||||
#include
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
EhSolverCancelledException solver_cancelled;
|
EhSolverCancelledException solver_cancelled;
|
||||||
|
|||||||
@@ -66,5 +66,5 @@ PREFIX="$(pwd)/depends/$BUILD/"
|
|||||||
|
|
||||||
HOST="$HOST" BUILD="$BUILD" "$MAKE" "$@" -C ./depends/ V=1 NO_QT=1
|
HOST="$HOST" BUILD="$BUILD" "$MAKE" "$@" -C ./depends/ V=1 NO_QT=1
|
||||||
./autogen.sh
|
./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
|
"$MAKE" "$@" V=1
|
||||||
|
|||||||
Reference in New Issue
Block a user