aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Rahul Bedarkar <rahul.bedarkar@imgtec.com>2016-12-05 21:38:22 +0530
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-12-05 21:31:08 +0100
commitfb0d4b557565c4742c0300a72fcb5baf2c26674d (patch)
tree837661cf6b85607847d6523f5ff4fa58e48102ee
parent4dc988c682e3cece90e277ff12d07aebe6188771 (diff)
downloadbuildroot-fb0d4b557565c4742c0300a72fcb5baf2c26674d.tar.gz
buildroot-fb0d4b557565c4742c0300a72fcb5baf2c26674d.tar.bz2
efivar: not available for static builds
efivar uses dlfcn.h which is not available in static builds configuration. Also propagate dependency to efibootmgr. This commit also does s/requires/needs/ in comment while at it. Fixes: http://autobuild.buildroot.net/results/ab3/ab32ccacfac2e65e1fcb307058d06c3d0122979d/ Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/efibootmgr/Config.in6
-rw-r--r--package/efivar/Config.in6
2 files changed, 8 insertions, 4 deletions
diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in
index 8b29938d8a..cd4bda1d75 100644
--- a/package/efibootmgr/Config.in
+++ b/package/efibootmgr/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_EFIBOOTMGR
bool "efibootmgr"
+ depends on !BR2_STATIC_LIBS # efivar
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar
depends on !BR2_TOOLCHAIN_USES_MUSL # efivar
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar
@@ -15,8 +16,9 @@ config BR2_PACKAGE_EFIBOOTMGR
https://github.com/rhinstaller/efibootmgr
-comment "efibootmgr requires a glibc or uClibc toolchain w/ headers >= 3.12, gcc >= 4.9"
- depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
+comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9"
+ depends on BR2_STATIC_LIBS || \
+ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
BR2_TOOLCHAIN_USES_MUSL || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \
diff --git a/package/efivar/Config.in b/package/efivar/Config.in
index 1bdb6cad63..a97c766be4 100644
--- a/package/efivar/Config.in
+++ b/package/efivar/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_EFIVAR
bool "efivar"
+ depends on !BR2_STATIC_LIBS # dlfcn.h
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h
# linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4,
# and the efivar source handles that situation. However, some
@@ -18,8 +19,9 @@ config BR2_PACKAGE_EFIVAR
https://github.com/rhinstaller/efivar
-comment "efivar requires a glibc or uClibc toolchain w/ headers >= 3.12, gcc >= 4.9"
- depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
+comment "efivar needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9"
+ depends on BR2_STATIC_LIBS || \
+ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
BR2_TOOLCHAIN_USES_MUSL || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \