Commit 32f05084 authored by Ghislain MARY's avatar Ghislain MARY

Use target armv6-linux-gcc to build libvpx for raspberry instead of gnu-generic.

parent 9ecdc0ec
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
# #
############################################################################ ############################################################################
if("@CMAKE_C_COMPILER_ID@" STREQUAL "GNU")
string(REGEX REPLACE "gcc$" "as" AS_COMPILER "@CMAKE_C_COMPILER@")
set(AUTOTOOLS_AS_COMPILER ${AS_COMPILER} CACHE PATH "Initial cache" FORCE)
endif()
set(AUTOTOOLS_C_COMPILER "@CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE) set(AUTOTOOLS_C_COMPILER "@CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_CXX_COMPILER "@CMAKE_CXX_COMPILER@" CACHE PATH "Initial cache" FORCE) set(AUTOTOOLS_CXX_COMPILER "@CMAKE_CXX_COMPILER@" CACHE PATH "Initial cache" FORCE)
set(AUTOTOOLS_OBJC_COMPILER "@CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE) set(AUTOTOOLS_OBJC_COMPILER "@CMAKE_C_COMPILER@" CACHE PATH "Initial cache" FORCE)
......
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
############################################################################ ############################################################################
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
configure_file(${CMAKE_SOURCE_DIR}/Autotools.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Autotools.cmake) configure_file(${CMAKE_SOURCE_DIR}/Autotools.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Autotools.cmake @ONLY)
#!/bin/sh #!/bin/sh
if [ -n "@AUTOTOOLS_AS_COMPILER@" ]
then
export AS="@AUTOTOOLS_AS_COMPILER@"
fi
export CC="@AUTOTOOLS_C_COMPILER@" export CC="@AUTOTOOLS_C_COMPILER@"
export CXX="@AUTOTOOLS_CXX_COMPILER@" export CXX="@AUTOTOOLS_CXX_COMPILER@"
export OBJC="@AUTOTOOLS_OBJC_COMPILER@" export OBJC="@AUTOTOOLS_OBJC_COMPILER@"
......
#!/bin/sh #!/bin/sh
if [ -n "@AUTOTOOLS_AS_COMPILER@" ]
then
export AS="@AUTOTOOLS_AS_COMPILER@"
fi
export CC="@AUTOTOOLS_C_COMPILER@" export CC="@AUTOTOOLS_C_COMPILER@"
export CXX="@AUTOTOOLS_CXX_COMPILER@" export CXX="@AUTOTOOLS_CXX_COMPILER@"
export OBJC="@AUTOTOOLS_OBJC_COMPILER@" export OBJC="@AUTOTOOLS_OBJC_COMPILER@"
...@@ -21,4 +25,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@" ...@@ -21,4 +25,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@" export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
cd @ep_build@ cd @ep_build@
make V=@AUTOTOOLS_VERBOSE_MAKEFILE@ @ep_redirect_to_file@ make V=@AUTOTOOLS_VERBOSE_MAKEFILE@ @ep_redirect_to_file@
\ No newline at end of file
#!/bin/sh #!/bin/sh
if [ -n "@AUTOTOOLS_AS_COMPILER@" ]
then
export AS="@AUTOTOOLS_AS_COMPILER@"
fi
export CC="@AUTOTOOLS_C_COMPILER@" export CC="@AUTOTOOLS_C_COMPILER@"
export CXX="@AUTOTOOLS_CXX_COMPILER@" export CXX="@AUTOTOOLS_CXX_COMPILER@"
export OBJC="@AUTOTOOLS_OBJC_COMPILER@" export OBJC="@AUTOTOOLS_OBJC_COMPILER@"
......
#!/bin/sh #!/bin/sh
if [ -n "@AUTOTOOLS_AS_COMPILER@" ]
then
export AS="@AUTOTOOLS_AS_COMPILER@"
fi
export CC="@AUTOTOOLS_C_COMPILER@" export CC="@AUTOTOOLS_C_COMPILER@"
export CXX="@AUTOTOOLS_CXX_COMPILER@" export CXX="@AUTOTOOLS_CXX_COMPILER@"
export OBJC="@AUTOTOOLS_OBJC_COMPILER@" export OBJC="@AUTOTOOLS_OBJC_COMPILER@"
......
#!/bin/sh #!/bin/sh
if [ -n "@AUTOTOOLS_AS_COMPILER@" ]
then
export AS="@AUTOTOOLS_AS_COMPILER@"
fi
export CC="@AUTOTOOLS_C_COMPILER@" export CC="@AUTOTOOLS_C_COMPILER@"
export CXX="@AUTOTOOLS_CXX_COMPILER@" export CXX="@AUTOTOOLS_CXX_COMPILER@"
export OBJC="@AUTOTOOLS_OBJC_COMPILER@" export OBJC="@AUTOTOOLS_OBJC_COMPILER@"
......
#!/bin/sh #!/bin/sh
if [ -n "@AUTOTOOLS_AS_COMPILER@" ]
then
export AS="@AUTOTOOLS_AS_COMPILER@"
fi
export CC="@AUTOTOOLS_C_COMPILER@" export CC="@AUTOTOOLS_C_COMPILER@"
export CXX="@AUTOTOOLS_CXX_COMPILER@" export CXX="@AUTOTOOLS_CXX_COMPILER@"
export OBJC="@AUTOTOOLS_OBJC_COMPILER@" export OBJC="@AUTOTOOLS_OBJC_COMPILER@"
......
...@@ -38,5 +38,5 @@ set(EP_ffmpeg_CROSS_COMPILATION_OPTIONS ...@@ -38,5 +38,5 @@ set(EP_ffmpeg_CROSS_COMPILATION_OPTIONS
# vpx # vpx
set(EP_vpx_CROSS_COMPILATION_OPTIONS set(EP_vpx_CROSS_COMPILATION_OPTIONS
"--prefix=${CMAKE_INSTALL_PREFIX}" "--prefix=${CMAKE_INSTALL_PREFIX}"
"--target=generic-gnu" "--target=armv6-linux-gcc"
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment