|
@@ -54,8 +54,8 @@ GDB_DEPENDENCIES += host-flex host-bison
|
|
HOST_GDB_DEPENDENCIES += host-flex host-bison
|
|
HOST_GDB_DEPENDENCIES += host-flex host-bison
|
|
endif
|
|
endif
|
|
|
|
|
|
-# All newer versions of GDB need host-gmp
|
|
|
|
-HOST_GDB_DEPENDENCIES += host-gmp
|
|
|
|
|
|
+# All newer versions of GDB need host-gmp and host-mpfr
|
|
|
|
+HOST_GDB_DEPENDENCIES += host-gmp host-mpfr
|
|
|
|
|
|
# When gdb sources are fetched from the binutils-gdb repository, they
|
|
# When gdb sources are fetched from the binutils-gdb repository, they
|
|
# also contain the binutils sources, but binutils shouldn't be built,
|
|
# also contain the binutils sources, but binutils shouldn't be built,
|
|
@@ -160,11 +160,8 @@ GDB_CONF_OPTS += \
|
|
GDB_DEPENDENCIES += gmp
|
|
GDB_DEPENDENCIES += gmp
|
|
endif
|
|
endif
|
|
|
|
|
|
-# Starting from GDB 14.x, mpfr is needed as a dependency to build full
|
|
|
|
-# gdb.
|
|
|
|
-# GDB fork from ARC GNU tools 2023.09 is based on GDB14 branch and so
|
|
|
|
-# requires MPFR as well.
|
|
|
|
-ifeq ($(BR2_PACKAGE_GDB_DEBUGGER):$(BR2_GDB_VERSION_13),y:)
|
|
|
|
|
|
+# mpfr is needed as a dependency to build full gdb
|
|
|
|
+ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y)
|
|
GDB_DEPENDENCIES += mpfr
|
|
GDB_DEPENDENCIES += mpfr
|
|
GDB_CONF_OPTS += --with-mpfr=$(STAGING_DIR)
|
|
GDB_CONF_OPTS += --with-mpfr=$(STAGING_DIR)
|
|
else
|
|
else
|
|
@@ -265,17 +262,8 @@ HOST_GDB_CONF_OPTS = \
|
|
--with-system-zlib \
|
|
--with-system-zlib \
|
|
--with-curses \
|
|
--with-curses \
|
|
--disable-source-highlight \
|
|
--disable-source-highlight \
|
|
- $(GDB_DISABLE_BINUTILS_CONF_OPTS)
|
|
|
|
-
|
|
|
|
-# GDB newer than 14.x need host-mpfr
|
|
|
|
-# GDB fork from ARC GNU tools 2023.09 is based on GDB14 branch and so
|
|
|
|
-# requires MPFR as well.
|
|
|
|
-ifeq ($(BR2_GDB_VERSION_13),)
|
|
|
|
-HOST_GDB_DEPENDENCIES += host-mpfr
|
|
|
|
-HOST_GDB_CONF_OPTS += --with-mpfr=$(HOST_DIR)
|
|
|
|
-else
|
|
|
|
-HOST_GDB_CONF_OPTS += --without-mpfr
|
|
|
|
-endif
|
|
|
|
|
|
+ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \
|
|
|
|
+ --with-mpfr=$(HOST_DIR)
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y)
|
|
ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y)
|
|
HOST_GDB_CONF_OPTS += --enable-tui
|
|
HOST_GDB_CONF_OPTS += --enable-tui
|