neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

depends: allow for CONFIG_SITE to be used rather than stealing prefix

Browse Source 
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=/
This commit is contained in:
Cory Fields 2016-06-07 15:45:02 -04:00 committed by Holger Schinzel
parent 4abf0bea08
commit 4f142caa56
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
depends/config.site.in
View File

@ -1,24 +1,26 @@
depends_prefix="`dirname ${ac_site_file}`/.."
cross_compiling=maybe cross_compiling=maybe
host_alias=@HOST@ host_alias=@HOST@
ac_tool_prefix=${host_alias}- ac_tool_prefix=${host_alias}-
if test -z $with_boost; then if test -z $with_boost; then
with_boost=$prefix with_boost=$depends_prefix
fi fi
if test -z $with_qt_plugindir; then if test -z $with_qt_plugindir; then
with_qt_plugindir=$prefix/plugins with_qt_plugindir=$depends_prefix/plugins
fi fi
if test -z $with_qt_translationdir; then if test -z $with_qt_translationdir; then
with_qt_translationdir=$prefix/translations with_qt_translationdir=$depends_prefix/translations
fi fi
if test -z $with_qt_bindir; then if test -z $with_qt_bindir; then
with_qt_bindir=$prefix/native/bin with_qt_bindir=$depends_prefix/native/bin
fi fi
if test -z $with_protoc_bindir; then if test -z $with_protoc_bindir; then
with_protoc_bindir=$prefix/native/bin with_protoc_bindir=$depends_prefix/native/bin
fi fi
if test -z $with_comparison_tool; then 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 fi
@ -41,31 +43,33 @@ fi
if test x@host_os@ = xmingw32; then if test x@host_os@ = xmingw32; then
if test -z $with_qt_incdir; then if test -z $with_qt_incdir; then
with_qt_incdir=$prefix/include with_qt_incdir=$depends_prefix/include
fi fi
if test -z $with_qt_libdir; then if test -z $with_qt_libdir; then
with_qt_libdir=$prefix/lib with_qt_libdir=$depends_prefix/lib
fi fi
fi fi
PATH=$prefix/native/bin:$PATH PATH=$depends_prefix/native/bin:$PATH
PKG_CONFIG="`which pkg-config` --static" PKG_CONFIG="`which pkg-config` --static"
# These two need to remain exported because pkg-config does not see them # 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 # otherwise. That means they must be unexported at the end of configure.ac to
# avoid ruining the cache. Sigh. # avoid ruining the cache. Sigh.
export PKG_CONFIG_LIBDIR=$prefix/lib/pkgconfig export PKG_CONFIG_LIBDIR=$depends_prefix/lib/pkgconfig
export PKG_CONFIG_PATH=$prefix/share/pkgconfig export PKG_CONFIG_PATH=$depends_prefix/share/pkgconfig
CPPFLAGS="-I$prefix/include/ $CPPFLAGS" CPPFLAGS="-I$depends_prefix/include/ $CPPFLAGS"
LDFLAGS="-L$prefix/lib $LDFLAGS" LDFLAGS="-L$depends_prefix/lib $LDFLAGS"
CC="@CC@" CC="@CC@"
CXX="@CXX@" CXX="@CXX@"
OBJC="${CC}" OBJC="${CC}"
OBJCXX="${CXX}" OBJCXX="${CXX}"
CCACHE=$prefix/native/bin/ccache CCACHE=$prefix/native/bin/ccache
CCACHE=$depends_prefix/native/bin/ccache
PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH
if test -n "@AR@"; then if test -n "@AR@"; then
AR=@AR@ AR=@AR@