jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use BR2_TOOLCHAIN_BUILDROOT instead of BR2_TOOLCHAIN_SOURCE

Browse Source 
The BR2_TOOLCHAIN_SOURCE option is removed in a future commit.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2009-12-14 12:10:12 +01:00
parent 8a5c3653ac
commit bc994c533c
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -197,7 +197,7 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared
# along with the packages to build for the target. # along with the packages to build for the target.
# #
############################################################## ##############################################################
ifeq ($(BR2_TOOLCHAIN_SOURCE),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers
else else
BASE_TARGETS:=uclibc BASE_TARGETS:=uclibc
@ -289,7 +289,7 @@ include .config.cmd
# We also need the various per-package makefiles, which also add # We also need the various per-package makefiles, which also add
# each selected package to TARGETS if that package was selected # each selected package to TARGETS if that package was selected
# in the .config file. # in the .config file.
ifeq ($(BR2_TOOLCHAIN_SOURCE),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
# avoid pulling in external toolchain which is broken for toplvl parallel builds # avoid pulling in external toolchain which is broken for toplvl parallel builds
# Explicit ordering: # Explicit ordering:
include toolchain/dependencies/dependencies.mk include toolchain/dependencies/dependencies.mk

4
package/Makefile.in
View File

@ -36,7 +36,7 @@ endif
######################################################################### #########################################################################
ifeq ($(BR2_TOOLCHAIN_SOURCE),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \ TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \
-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
@ -105,7 +105,7 @@ XXXX=xxxx
ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX) ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
endif endif
ifeq ($(BR2_TOOLCHAIN_SOURCE),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
TOOLCHAIN_DIR=$(BASE_DIR)/toolchain TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
# Quotes are needed for spaces et al in path components. # Quotes are needed for spaces et al in path components.

2
target/Config.in
View File

@ -74,7 +74,7 @@ config BR2_KERNEL_LINUX_ADVANCED
# The kernel with the same version as linux headers cannot be compiled # The kernel with the same version as linux headers cannot be compiled
# when using an external toolchain, because the linux headers are not # when using an external toolchain, because the linux headers are not
# handled by Buildroot in this case. # handled by Buildroot in this case.
if BR2_TOOLCHAIN_SOURCE if BR2_TOOLCHAIN_BUILDROOT
config BR2_KERNEL_LINUX config BR2_KERNEL_LINUX
bool "linux (Same version as linux headers)" bool "linux (Same version as linux headers)"

2
toolchain/Config.in.1
View File

@ -1,6 +1,6 @@
# #
if BR2_TOOLCHAIN_SOURCE if BR2_TOOLCHAIN_BUILDROOT
source "toolchain/kernel-headers/Config.in" source "toolchain/kernel-headers/Config.in"
source "toolchain/uClibc/Config.in" source "toolchain/uClibc/Config.in"
source "toolchain/binutils/Config.in" source "toolchain/binutils/Config.in"

6
toolchain/Config.in.2
View File

@ -37,7 +37,7 @@ config BR2_ENABLE_LOCALE
config BR2_ENABLE_LOCALE_PREGENERATED config BR2_ENABLE_LOCALE_PREGENERATED
bool "Use pregenerated locale data?" bool "Use pregenerated locale data?"
depends on BR2_ENABLE_LOCALE && BR2_TOOLCHAIN_SOURCE && BROKEN # tarball missing depends on BR2_ENABLE_LOCALE && BR2_TOOLCHAIN_BUILDROOT && BROKEN # tarball missing
help help
Instead of generating the locale data locally you can optionally Instead of generating the locale data locally you can optionally
download a pregenerated set of locales. download a pregenerated set of locales.
@ -142,7 +142,7 @@ config BR2_GCC_CROSS_CXX
config BR2_INSTALL_LIBSTDCPP config BR2_INSTALL_LIBSTDCPP
bool "Build/install c++ compiler and libstdc++?" bool "Build/install c++ compiler and libstdc++?"
select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_SOURCE) select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_BUILDROOT)
select BR2_GCC_CROSS_CXX select BR2_GCC_CROSS_CXX
help help
If you are building your own toolchain and want to build and install If you are building your own toolchain and want to build and install
@ -157,7 +157,7 @@ config BR2_TARGET_OPTIMIZATION
help help
Optimizations to use when building for the target host. Optimizations to use when building for the target host.
if BR2_TOOLCHAIN_SOURCE if BR2_TOOLCHAIN_BUILDROOT
source "toolchain/elf2flt/Config.in" source "toolchain/elf2flt/Config.in"
source "toolchain/mklibs/Config.in" source "toolchain/mklibs/Config.in"
source "toolchain/sstrip/Config.in" source "toolchain/sstrip/Config.in"

2
toolchain/gcc/gcc-uclibc-3.x.mk
View File

@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
ifeq ($(BR2_TOOLCHAIN_SOURCE),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
# without sysroot support. Sysroot toolchain is gcc-uclibc-4.x.mk # without sysroot support. Sysroot toolchain is gcc-uclibc-4.x.mk
ifneq ($(BR2_TOOLCHAIN_SYSROOT),y) ifneq ($(BR2_TOOLCHAIN_SYSROOT),y)

2
toolchain/uClibc/uclibc.mk
View File

@ -4,7 +4,7 @@
# #
############################################################# #############################################################
ifeq ($(BR2_TOOLCHAIN_SOURCE),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
# specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config
# setting. # setting.