Skip to content

Commit

Permalink
depends: allow for CONFIG_SITE to be used rather than stealing prefix
Browse files Browse the repository at this point in the history
This does not break any existing prefix behavior, only makes new behavior work.

For example:
CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure --prefix=/
  • Loading branch information
theuni authored and str4d committed Oct 15, 2016
1 parent 2762638 commit e6fa787
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions depends/config.site.in
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
depends_prefix="`dirname ${ac_site_file}`/.."

cross_compiling=maybe
host_alias=@HOST@
ac_tool_prefix=${host_alias}-

if test -z $with_boost; then
with_boost=$prefix
with_boost=$depends_prefix
fi
if test -z $with_qt_plugindir; then
with_qt_plugindir=$prefix/plugins
with_qt_plugindir=$depends_prefix/plugins
fi
if test -z $with_qt_translationdir; then
with_qt_translationdir=$prefix/translations
with_qt_translationdir=$depends_prefix/translations
fi
if test -z $with_qt_bindir; then
with_qt_bindir=$prefix/native/bin
with_qt_bindir=$depends_prefix/native/bin
fi
if test -z $with_protoc_bindir; then
with_protoc_bindir=$prefix/native/bin
with_protoc_bindir=$depends_prefix/native/bin
fi
# Disable comparison utility (#592)
#if test -z $with_comparison_tool; then
# with_comparison_tool=$prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar
# with_comparison_tool=$depends_prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar
#fi


Expand All @@ -42,31 +44,31 @@ fi

if test x@host_os@ = xmingw32; then
if test -z $with_qt_incdir; then
with_qt_incdir=$prefix/include
with_qt_incdir=$depends_prefix/include
fi
if test -z $with_qt_libdir; then
with_qt_libdir=$prefix/lib
with_qt_libdir=$depends_prefix/lib
fi
fi

PATH=$prefix/native/bin:$PATH
PATH=$depends_prefix/native/bin:$PATH
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=$prefix/lib/pkgconfig
export PKG_CONFIG_PATH=$prefix/share/pkgconfig
export PKG_CONFIG_LIBDIR=$depends_prefix/lib/pkgconfig
export PKG_CONFIG_PATH=$depends_prefix/share/pkgconfig

CPPFLAGS="-I$prefix/include/ $CPPFLAGS"
LDFLAGS="-L$prefix/lib $LDFLAGS"
CPPFLAGS="-I$depends_prefix/include/ $CPPFLAGS"
LDFLAGS="-L$depends_prefix/lib $LDFLAGS"

CC="@CC@"
CXX="@CXX@"
OBJC="${CC}"
OBJCXX="${CXX}"
CCACHE=$prefix/native/bin/ccache
CCACHE=$depends_prefix/native/bin/ccache

if test -n "@AR@"; then
AR=@AR@
Expand Down

0 comments on commit e6fa787

Please sign in to comment.