summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-04-03 17:44:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-05 11:46:34 +0100
commit1921711c9e7a915dbf04c3909bee39450c907845 (patch)
treed5d14d1dbef706c2867a7c51eaca4ca5f101249a
parent869020dac889e9ed79a294f308a87cfd946a68bd (diff)
downloadopenembedded-core-contrib-1921711c9e7a915dbf04c3909bee39450c907845.tar.gz
binutils: Use configure options to disable gdb and dependencies
Deleting sources is a rough way of dealing with disabling components, using configure option is elegant way and we also keep the sources unchanged, this should not cause any funcitonal changes otherwise Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.34.inc4
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc5
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.34.bb5
3 files changed, 10 insertions, 4 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.34.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc
index ed9f902fd2..4b085b6fe0 100644
--- a/meta/recipes-devtools/binutils/binutils-2.34.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.34.inc
@@ -43,7 +43,3 @@ SRC_URI = "\
file://CVE-2020-0551.patch \
"
S = "${WORKDIR}/git"
-
-do_configure_prepend () {
- rm -rf ${S}/gdb ${S}/libdecnumber ${S}/readline ${S}/sim
-}
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index f6c20fc229..4119960c63 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -75,6 +75,11 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
--disable-werror \
--enable-deterministic-archives \
--enable-plugins \
+ --disable-gdb \
+ --disable-gdbserver \
+ --disable-libdecnumber \
+ --disable-readline \
+ --disable-sim \
${LDGOLD} \
${EXTRA_TARGETS} \
${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
diff --git a/meta/recipes-devtools/binutils/binutils_2.34.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb
index bfc9346822..2e645e1ed8 100644
--- a/meta/recipes-devtools/binutils/binutils_2.34.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.34.bb
@@ -18,6 +18,11 @@ EXTRA_OECONF_class-native = "--enable-targets=all \
--enable-64-bit-bfd \
--enable-install-libiberty \
--enable-install-libbfd \
+ --disable-gdb \
+ --disable-gdbserver \
+ --disable-libdecnumber \
+ --disable-readline \
+ --disable-sim \
--disable-werror"
# gcc9.0 end up mis-compiling libbfd.so with O2 which then crashes on target