aboutsummaryrefslogtreecommitdiff
path: root/Config.in
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2014-02-28 14:30:23 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-02-28 14:30:23 +0100
commitb108fdcb83d457e5d43298fb93dbfd805d076f24 (patch)
tree7fbd64a13fc915f5cea93708419cb3c6aa1b40ea /Config.in
parenta6cfaea44e5105cb66e4e797042f64335f5e7c01 (diff)
parent9e40a1005f51d10784db295797ed270a130d79d5 (diff)
downloadbuildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.tar.gz
buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.tar.bz2
Merge branch 'next'
Conflicts: Makefile package/dmraid/Config.in package/gdb/Config.in.host package/linux-headers/linux-headers.mk package/python/python.mk package/python3/python3.mk package/rt-tests/Config.in package/sdl/sdl.mk package/systemd/systemd-01-fix-getty-unit.patch package/systemd/systemd-02-fix-page-size.patch package/systemd/systemd-03-uclibc-fix.patch package/udev/Config.in package/udisks/Config.in package/vlc/vlc.mk system/Config.in Quite some merge conflicts, hopefully I didn't screw up anything. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'Config.in')
-rw-r--r--Config.in18
1 files changed, 17 insertions, 1 deletions
diff --git a/Config.in b/Config.in
index d05f4b1a0e..b904195e9f 100644
--- a/Config.in
+++ b/Config.in
@@ -18,6 +18,11 @@ config BR2_EXTERNAL
string
option env="BR2_EXTERNAL"
+# Hidden boolean selected by packages in need of Java in order to build
+# (example: xbmc)
+config BR2_NEEDS_HOST_JAVA
+ bool
+
# Hidden boolean selected by pre-built packages for x86, when they
# need to run on x86-64 machines (example: pre-built external
# toolchains, binary tools like SAM-BA, etc.).
@@ -225,6 +230,17 @@ config BR2_LUAROCKS_MIRROR
See http://luarocks.org
+config BR2_CPAN_MIRROR
+ string "CPAN mirror (Perl packages)"
+ default "http://search.cpan.org/CPAN"
+ help
+ CPAN (Comprehensive Perl Archive Network) is a repository
+ of Perl packages. It has multiple software mirrors scattered
+ around the world. This option allows you to select a mirror.
+
+ The list of mirrors is available at:
+ http://search.cpan.org/mirror
+
endmenu
config BR2_JLEVEL
@@ -470,7 +486,7 @@ config BR2_PREFER_STATIC_LIB
config BR2_PACKAGE_OVERRIDE_FILE
string "location of a package override file"
- default "$(TOPDIR)/local.mk"
+ default "$(CONFIG_DIR)/local.mk"
help
A package override file is a short makefile that contains
variable definitions of the form <pkg>_OVERRIDE_SRCDIR,