Skip to content

Commit

Permalink
Port depends
Browse files Browse the repository at this point in the history
  • Loading branch information
timemarkovqtum committed May 14, 2021
1 parent a592e14 commit 039f09e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
8 changes: 7 additions & 1 deletion build-aux/m4/ax_boost_base.m4
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,14 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
[multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
)
dnl some arches may advertise a cpu type that doesn't line up with their
dnl prefix's cpu type. For example, uname may report armv7l while libs are
dnl installed to /usr/lib/arm-linux-gnueabihf. Try getting the compiler's
dnl value for an extra chance of finding the correct path.
libsubdirs="lib/`$CXX -dumpmachine 2>/dev/null` $libsubdirs"
dnl first we check the system location for boost libraries
dnl this location ist chosen if boost libraries are installed with the --layout=system option
dnl this location is chosen if boost libraries are installed with the --layout=system option
dnl or if you install boost with RPM
AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[
AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"])
Expand Down
2 changes: 1 addition & 1 deletion depends/packages/boost.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ifneq (,$(findstring clang,$($(package)_cxx)))
$(package)_toolset_$(host_os)=clang
endif
$(package)_archiver_$(host_os)=$($(package)_ar)
$(package)_config_libraries=filesystem,system,thread,test
$(package)_config_libraries=filesystem,program_options,system,thread,test,random
$(package)_cxxflags=-std=c++11 -fvisibility=hidden
$(package)_cxxflags_linux=-fPIC
$(package)_cxxflags_android=-fPIC
Expand Down
6 changes: 4 additions & 2 deletions depends/packages/gmp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ $(package)_file_name=$(package)-$($(package)_version).tar.xz
$(package)_download_path=https://gmplib.org/download/$(package)

define $(package)_set_vars
$(package)_config_opts=--enable-static=yes --enable-shared=no --enable-cxx
$(package)_config_opts_linux=--with-pic
$(package)_config_opts=--disable-shared --enable-cxx
$(package)_config_opts += --enable-option-checking
$(package)_config_opts_linux=--with-pic
$(package)_config_opts_darwin += --with-pic
endef

define $(package)_preprocess_cmds
Expand Down
2 changes: 1 addition & 1 deletion depends/packages/packages.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packages:=boost libevent
packages:=boost openssl libevent gmp

qt_packages = zlib

Expand Down

0 comments on commit 039f09e

Please sign in to comment.