adjust gdb version selection

- choose gdb-latest based on gcc version with c++11 support only
SynoCommunity · Sep 16, 2023 · 74d39b6 · 74d39b6
1 parent 4bad7fc
commit 74d39b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/cross/gdb/Makefile b/cross/gdb/Makefile
@@ -5,13 +5,9 @@ OPTIONAL_DEPENDS += cross/gdb-7.12
 
 include ../../mk/spksrc.main-depends.mk
 
-ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(PPC_ARCHS)),$(ARCH))
-DEPENDS += cross/gdb-7.12
-else
-ifeq ($(call version_lt, $(TC_GCC), 4.8),1)
+ifeq ($(call version_lt, $(TC_GCC), 4.8.1),1)
 DEPENDS += cross/gdb-7.12
 else
 # A compiler with support for C++11 language features is required.
 DEPENDS += cross/gdb-latest
 endif
-endif
diff --git a/spk/synocli-devel/Makefile b/spk/synocli-devel/Makefile
@@ -88,15 +88,11 @@ SPK_COMMANDS += bin/strip
 ##
 ## gdb
 ##
-ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(PPC_ARCHS)),$(ARCH))
-OPTIONAL_DESC += ", gdb 7.12.1"
-else
-ifeq ($(call version_lt, $(TC_GCC), 4.8),1)
+ifeq ($(call version_lt, $(TC_GCC), 4.8.1),1)
 OPTIONAL_DESC += ", gdb 7.12.1"
 else
 OPTIONAL_DESC += ", gdb 13.2"
 endif
-endif
 SPK_COMMANDS += bin/gcore
 SPK_COMMANDS += bin/gdb
 SPK_COMMANDS += bin/gdb-add-index