Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

depends: fixup paths after f320399

  • Loading branch information...
commit c5609c0e890847545302a7edd37802f4549f2233 1 parent 85abcdf
Cory Fields authored
View
40 tools/depends/Makefile.include.in
@@ -10,7 +10,7 @@ SDK_PLATFORM=@use_sdk@
RETRIEVE_TOOL=@CURL@
ARCHIVE_TOOL=@TAR@
PREFIX=@prefix@/@deps_dir@
-NATIVEPREFIX=@prefix@/@build_cpu@-@build_os@-native
+NATIVEPREFIX=@prefix@/@tool_dir@
OS=@platform_os@
CROSS_COMPILING=@cross_compiling@
@@ -23,10 +23,10 @@ HAS_LIBCRYSTAX=@has_libcrystax@
BASE_URL=http://mirrors.xbmc.org/build-deps/sources
RETRIEVE_TOOL_FLAGS=-Ls --create-dirs -f -O
ARCHIVE_TOOL_FLAGS=--strip-components=1 -xf
-CONFIG_SUB=@prefix@/@build_cpu@-@build_os@-native/share/automake-1.11/config.sub
-CONFIG_GUESS=@prefix@/@build_cpu@-@build_os@-native/share/automake-1.11/config.guess
+CONFIG_SUB=@prefix@/@tool_dir@/share/automake-1.11/config.sub
+CONFIG_GUESS=@prefix@/@tool_dir@/share/automake-1.11/config.guess
-RPL=@prefix@/@build_cpu@-@build_os@-native/bin/python @prefix@/@build_cpu@-@build_os@-native/bin/rpl
+RPL=@prefix@/@tool_dir@/bin/python @prefix@/@tool_dir@/bin/rpl
LD=@LD@
CC=@CC@
@@ -40,13 +40,13 @@ STRIP=@STRIP@
READELF=@READELF@
OBJDUMP=@OBJDUMP@
-CMAKE=@prefix@/@build_cpu@-@build_os@-native/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/share/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX)
+CMAKE=@prefix@/@tool_dir@/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/share/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX)
CFLAGS=@platform_cflags@ @platform_includes@ -I@prefix@/@deps_dir@/include
LDFLAGS=-L@prefix@/@deps_dir@/lib @platform_ldflags@
CXXFLAGS=@platform_cxxflags@ @platform_includes@ -I@prefix@/@deps_dir@/include
CPPFLAGS=@platform_cflags@ @platform_includes@ -I@prefix@/@deps_dir@/include
-PATH:=@prefix@/@build_cpu@-@build_os@-native/bin:$(PATH)
+PATH:=@prefix@/@tool_dir@/bin:$(PATH)
ifneq (@use_build_toolchain@,)
PATH:=@use_build_toolchain@/bin:@use_build_toolchain@/usr/bin:$(PATH)
endif
@@ -61,21 +61,21 @@ STRIP_FOR_BUILD=@STRIP_FOR_BUILD@
READELF_FOR_BUILD=@READELF_FOR_BUILD@
OBJDUMP_FOR_BUILD=@OBJDUMP_FOR_BUILD@
-NATIVE_CFLAGS=-I@prefix@/@build_cpu@-@build_os@-native/include
-NATIVE_LDFLAGS=-L@prefix@/@build_cpu@-@build_os@-native/lib
-NATIVE_CPPFLAGS=-I@prefix@/@build_cpu@-@build_os@-native/include
-NATIVE_CXXFLAGS=-I@prefix@/@build_cpu@-@build_os@-native/include
+NATIVE_CFLAGS=-I@prefix@/@tool_dir@/include
+NATIVE_LDFLAGS=-L@prefix@/@tool_dir@/lib
+NATIVE_CPPFLAGS=-I@prefix@/@tool_dir@/include
+NATIVE_CXXFLAGS=-I@prefix@/@tool_dir@/include
-export AUTOM4TE=@prefix@/@build_cpu@-@build_os@-native/bin/autom4te
-export AUTOMAKE=@prefix@/@build_cpu@-@build_os@-native/bin/automake
-export AUTOCONF=@prefix@/@build_cpu@-@build_os@-native/bin/autoconf
-export ACLOCAL=@prefix@/@build_cpu@-@build_os@-native/bin/aclocal
-export ACLOCAL_PATH=@prefix@/@deps_dir@/share/aclocal:@prefix@/@build_cpu@-@build_os@-native/share/aclocal
-export AUTOPOINT=@prefix@/@build_cpu@-@build_os@-native/bin/autopoint
-export AUTOHEADER=@prefix@/@build_cpu@-@build_os@-native/bin/autoheader
-export LIBTOOL=@prefix@/@build_cpu@-@build_os@-native/bin/libtool
-export LIBTOOLIZE=@prefix@/@build_cpu@-@build_os@-native/bin/libtoolize
+export AUTOM4TE=@prefix@/@tool_dir@/bin/autom4te
+export AUTOMAKE=@prefix@/@tool_dir@/bin/automake
+export AUTOCONF=@prefix@/@tool_dir@/bin/autoconf
+export ACLOCAL=@prefix@/@tool_dir@/bin/aclocal
+export ACLOCAL_PATH=@prefix@/@deps_dir@/share/aclocal:@prefix@/@tool_dir@/share/aclocal
+export AUTOPOINT=@prefix@/@tool_dir@/bin/autopoint
+export AUTOHEADER=@prefix@/@tool_dir@/bin/autoheader
+export LIBTOOL=@prefix@/@tool_dir@/bin/libtool
+export LIBTOOLIZE=@prefix@/@tool_dir@/bin/libtoolize
-export AUTORECONF=@prefix@/@build_cpu@-@build_os@-native/bin/autoreconf
+export AUTORECONF=@prefix@/@tool_dir@/bin/autoreconf
View
18 tools/depends/native/config.site.native.in
@@ -9,18 +9,18 @@ STRIP="${STRIP:-@STRIP_FOR_BUILD@}"
READELF="${READELF:-@READELF_FOR_BUILD@}"
OBJDUMP="${OBJDUMP:-@OBJDUMP_FOR_BUILD@}"
-CFLAGS="-I@prefix@/@build_cpu@-@build_os@-native/include $CFLAGS"
-LDFLAGS="-L@prefix@/@build_cpu@-@build_os@-native/lib $LDFLAGS"
-CPPFLAGS="-I@prefix@/@build_cpu@-@build_os@-native/include $CPPFLAGS"
-CXXFLAGS="-I@prefix@/@build_cpu@-@build_os@-native/include $CXXFLAGS"
+CFLAGS="-I@prefix@/@tool_dir@/include $CFLAGS"
+LDFLAGS="-L@prefix@/@tool_dir@/lib $LDFLAGS"
+CPPFLAGS="-I@prefix@/@tool_dir@/include $CPPFLAGS"
+CXXFLAGS="-I@prefix@/@tool_dir@/include $CXXFLAGS"
-PKG_CONFIG=@prefix@/@build_cpu@-@build_os@-native/bin/pkg-config
-export PKG_CONFIG_PATH=@prefix@/@build_cpu@-@build_os@-native/lib/pkgconfig
+PKG_CONFIG=@prefix@/@tool_dir@/bin/pkg-config
+export PKG_CONFIG_PATH=@prefix@/@tool_dir@/lib/pkgconfig
-PATH=@prefix@/@build_cpu@-@build_os@-native/bin:$PATH
+PATH=@prefix@/@tool_dir@/bin:$PATH
if test -n "@use_build_toolchain@"; then
PATH=@use_build_toolchain@/usr/bin:@use_build_toolchain@/bin:$PATH
fi
-LD_LIBRARY_PATH=@prefix@/@build_cpu@-@build_os@-native/lib:$LD_LIBRARY_PATH
-NASM=@prefix@/@build_cpu@-@build_os@-native/bin/yasm
+LD_LIBRARY_PATH=@prefix@/@tool_dir@/lib:$LD_LIBRARY_PATH
+NASM=@prefix@/@tool_dir@/bin/yasm
View
16 tools/depends/target/config.site.in
@@ -16,8 +16,8 @@ RANLIB="@RANLIB@"
OBJDUMP="@OBJDUMP@"
if test "@platform_os@" = "ios" ; then
- export AS="@prefix@/@build_cpu@-@build_os@-native/bin/gas-preprocessor.pl @CC@"
- export CCAS="--tag CC @prefix@/@build_cpu@-@build_os@-native/bin/gas-preprocessor.pl @CC@"
+ export AS="@prefix@/@tool_dir@/bin/gas-preprocessor.pl @CC@"
+ export CCAS="--tag CC @prefix@/@tool_dir@/bin/gas-preprocessor.pl @CC@"
fi
CFLAGS="@platform_cflags@ @platform_includes@ -I@prefix@/@deps_dir@/include $CFLAGS"
@@ -25,21 +25,21 @@ LDFLAGS="-L@prefix@/@deps_dir@/lib @platform_ldflags@ $LDFLAGS"
CXXFLAGS="@platform_cxxflags@ @platform_includes@ -I@prefix@/@deps_dir@/include $CXXFLAGS"
CPPFLAGS="@platform_cflags@ @platform_includes@ -I@prefix@/@deps_dir@/include $CPPFLAGS"
-export PKG_CONFIG=@prefix@/@build_cpu@-@build_os@-native/bin/pkg-config
+export PKG_CONFIG=@prefix@/@tool_dir@/bin/pkg-config
export PKG_CONFIG_PATH=@prefix@/@deps_dir@/lib/pkgconfig
-export YASM=@prefix@/@build_cpu@-@build_os@-native/bin/yasm
-export NASM=@prefix@/@build_cpu@-@build_os@-native/bin/yasm
+export YASM=@prefix@/@tool_dir@/bin/yasm
+export NASM=@prefix@/@tool_dir@/bin/yasm
export MYSQL_CONFIG=@prefix@/@deps_dir@/bin/mysql_config
-PATH=@prefix@/@build_cpu@-@build_os@-native/bin:@use_toolchain@/usr/bin:@use_toolchain@/bin:$PATH
-LD_LIBRARY_PATH=@prefix@/@build_cpu@-@build_os@-native/lib:$LD_LIBRARY_PATH
+PATH=@prefix@/@tool_dir@/bin:@use_toolchain@/usr/bin:@use_toolchain@/bin:$PATH
+LD_LIBRARY_PATH=@prefix@/@tool_dir@/lib:$LD_LIBRARY_PATH
PYTHON_VERSION=2.6
PYTHON_LDFLAGS="-L@prefix@/@deps_dir@/lib -lpython${PYTHON_VERSION} -lc -ldl -lm -lexpat -lffi -lintl -lutil -lssl -lcrypto"
PYTHON_CPPFLAGS=-I@prefix@/@deps_dir@/include/python${PYTHON_VERSION}
PYTHON_SITE_PKG=@prefix@/@deps_dir@/lib/python${PYTHON_VERSION}/site-packages
PYTHON_NOVERSIONCHECK=no-check
-USE_TEXTUREPACKER_NATIVE_ROOT=@prefix@/@build_cpu@-@build_os@-native
+USE_TEXTUREPACKER_NATIVE_ROOT=@prefix@/@tool_dir@
#afps-ng and libomxil-bellagio
ac_cv_func_malloc_0_nonnull=yes
Please sign in to comment.
Something went wrong with that request. Please try again.