diff options
author | TheCharlatan <seb.kung@gmail.com> | 2018-03-20 01:26:35 +0100 |
---|---|---|
committer | TheCharlatan <seb.kung@gmail.com> | 2018-09-10 22:03:42 +0200 |
commit | 8db3d5731bc999983ca6c776731a26a4e97d8bc8 (patch) | |
tree | 827e31e63fce7f604de95d0951ef4c951b886bce /contrib/depends/config.site.in | |
parent | Initial depends addition (diff) | |
download | monero-8db3d5731bc999983ca6c776731a26a4e97d8bc8.tar.xz |
Modify depends for monero's dependencies
Add readline, ldns, graphviz, unbound to depends packages
Add a cmake toolchain file to depends that is uniquely created for every build and placed in triple/share/toolchain.cmake
This file is then passed to cmake with -DCMAKE_TOOLCHAIN_FILE=/path/to/triple/share/toolchain.cmake
Add the boost locale package to depends
In the depends cmake toolchain file, a DEPENDS flag is added
to exclude, or change cmake checks done that are required for depends
Link miniupnpc and unwind from depends and not external
Add libiconv and icu4c to depends, required for mingw32 builds.
Headers (winsock) need to be lower case in order to compile on unix systems.
This should not affect building on windows.
Diffstat (limited to 'contrib/depends/config.site.in')
-rw-r--r-- | contrib/depends/config.site.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/depends/config.site.in b/contrib/depends/config.site.in index 3d7c9fd43..0a4a9c327 100644 --- a/contrib/depends/config.site.in +++ b/contrib/depends/config.site.in @@ -13,10 +13,10 @@ fi if test -z $with_qt_translationdir; then with_qt_translationdir=$depends_prefix/translations fi -if test -z $with_qt_bindir; then +if test -z $with_qt_bindir && test -z "@no_qt@"; then with_qt_bindir=$depends_prefix/native/bin fi -if test -z $with_protoc_bindir; then +if test -z $with_protoc_bindir && test -z "@no_qt@"; then with_protoc_bindir=$depends_prefix/native/bin fi @@ -53,9 +53,10 @@ PKG_CONFIG="`which pkg-config` --static" # These two need to remain exported because pkg-config does not see them # otherwise. That means they must be unexported at the end of configure.ac to # avoid ruining the cache. Sigh. - -export PKG_CONFIG_LIBDIR=$depends_prefix/lib/pkgconfig -export PKG_CONFIG_PATH=$depends_prefix/share/pkgconfig +export PKG_CONFIG_PATH=$depends_prefix/share/pkgconfig:$depends_prefix/lib/pkgconfig +if test -z "@allow_host_packages@"; then + export PKGCONFIG_LIBDIR= +fi CPPFLAGS="-I$depends_prefix/include/ $CPPFLAGS" LDFLAGS="-L$depends_prefix/lib $LDFLAGS" |