synocli-devel: Enable qoriq by disabling sim on gdb

SynoCommunity · Sep 13, 2023 · 213bcff · 213bcff
1 parent 4c3acbd
commit 213bcff
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/cross/gdb-7.12/Makefile b/cross/gdb-7.12/Makefile
@@ -26,6 +26,11 @@ CONFIGURE_ARGS += --with-system-zlib
 ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
 CONFIGURE_ARGS += --localstatedir=$(INSTALL_PREFIX_VAR)
 endif
+# disable simulator ; it's broken on ppc
+# https://scm.linefinity.com/common/openwrt/commit/079d57b0f290a79c9dbc013b6e9c83cebf8a2f99
+ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
+CONFIGURE_ARGS += --disable-sim
+endif
 
 include ../../mk/spksrc.cross-cc.mk
 

diff --git a/cross/gdb-latest/Makefile b/cross/gdb-latest/Makefile
@@ -11,11 +11,18 @@ HOMEPAGE = https://www.gnu.org/software/gdb/
 COMMENT  = The GNU Project Debugger
 LICENSE  = GPLv2/LGPLv2
 
+include ../../mk/spksrc.archs.mk
+
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS += --enable-host-shared
 CONFIGURE_ARGS += --with-system-zlib
+# disable simulator ; it's broken on ppc
+# https://scm.linefinity.com/common/openwrt/commit/079d57b0f290a79c9dbc013b6e9c83cebf8a2f99
+ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
+CONFIGURE_ARGS += --disable-sim
+endif
 
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(PPC_ARCHS)
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS)
 
 include ../../mk/spksrc.cross-cc.mk
 

diff --git a/cross/gdb/Makefile b/cross/gdb/Makefile
@@ -16,7 +16,7 @@ OPTIONAL_DEPENDS += cross/gdb-7.12
 
 include ../../mk/spksrc.install-resources.mk
 
-ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(PPC_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
 DEPENDS += cross/gdb-7.12
 else
 DEPENDS += cross/gdb-latest

diff --git a/cross/llvm-9.0/Makefile b/cross/llvm-9.0/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE = https://llvm.org/
 COMMENT = The LLVM Project is a collection of modular and reusable compiler and toolchain technologies
 LICENSE  = Apache License v2.0 with LLVM Exceptions
 
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(PPC_ARCHS)
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS)
 CMAKE_USE_NINJA = 1
 
 # Using LLVM project source need to change to llvm sub-directory

diff --git a/cross/llvm/Makefile b/cross/llvm/Makefile
@@ -4,7 +4,7 @@ HOMEPAGE = https://www.gnu.org/software/gdb/
 COMMENT  = The GNU Project Debugger
 LICENSE  = GPLv2/LGPLv2
 
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(PPC_ARCHS)
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS)
 
 DOWNLOAD_TARGET = nop
 CHECKSUM_TARGET = nop

diff --git a/diyspk/gdb/Makefile b/diyspk/gdb/Makefile
@@ -9,16 +9,13 @@ STARTABLE = no
 HOMEPAGE = https://www.sourceware.org/gdb/
 LICENSE  = GPLv2
 
-UNSUPPORTED_ARCHS = $(PPC_ARCHS)
-
 include ../../mk/spksrc.archs.mk
 
+DEPENDS = cross/gdb
 ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
-DEPENDS = cross/gdb-legacy
 SPK_VERS = 7.12.1
 else
-DEPENDS = cross/gdb
-SPK_VERS = 12.1
+SPK_VERS = 13.2
 endif
 
 SPK_COMMANDS  = bin/gcore

diff --git a/spk/synocli-devel/Makefile b/spk/synocli-devel/Makefile
@@ -14,8 +14,6 @@ LICENSE  = Each tool is licensed under it\'s respective license.
 
 SPK_DEPENDS = "Perl"
 
-UNSUPPORTED_ARCHS = $(PPC_ARCHS)
-
 OPTIONAL_DEPENDS = cross/llvm
 
 include ../../mk/spksrc.archs.mk