synocli-devel: fix autoconf (#6015) (#6079)

* fix autoconf (#6015)
- fix autoconf to use installed m4 command

* synocli-develop: update tools
- update binutils to v2.41 for DSM 6 and v2.42 for DSM 7
- update autoconf to v2.72
- update strace to v6.8

* fix binutils for 32-bit archs on DSM 7
* use binutils-latest for all toolchains with c++11 support

* update devel tools:
- update gdb to v14.2
- update strace to v6.9

cross/autoconf/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = autoconf
-PKG_VERS = 2.71
+PKG_VERS = 2.72
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnu.org/gnu/autoconf/
@@ -12,5 +12,12 @@ COMMENT = Autoconf is an extensible package of M4 macros that produce shell scr
 LICENSE = GPLv2
 
 GNU_CONFIGURE = 1
+POST_INSTALL_TARGET = autoconf_post_install
 
 include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: autoconf_post_install
+autoconf_post_install:
+ @$(MSG) Patch scripts to use installed m4 as default
+ @sed -i.bak -e 's|/usr/bin/m4|$(INSTALL_PREFIX)/bin/m4|g' $(STAGING_INSTALL_PREFIX)/bin/autom4te
+ @sed -i.bak -e 's|/usr/bin/m4|$(INSTALL_PREFIX)/bin/m4|g' $(STAGING_INSTALL_PREFIX)/bin/autoupdate

cross/autoconf/digests

@@ -1,3 +1,3 @@
-autoconf-2.71.tar.xz SHA1 1b5b1dbed849c6653be47c56d28d26fcf3f7238a
-autoconf-2.71.tar.xz SHA256 f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4
-autoconf-2.71.tar.xz MD5 12cfa1687ffa2606337efe1a64416106
+autoconf-2.72.tar.xz SHA1 1d082d999ff4506ec8f92c6ecb9732546f5204fb
+autoconf-2.72.tar.xz SHA256 ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a
+autoconf-2.72.tar.xz MD5 1be79f7106ab6767f18391c5e22be701

cross/binutils-2.41/Makefile

@@ -0,0 +1,39 @@
+PKG_NAME = binutils
+PKG_VERS = 2.41
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://ftp.gnu.org/gnu/binutils
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/zlib cross/mpfr
+
+HOMEPAGE = https://www.gnu.org/software/binutils/
+COMMENT = GNU Binutils
+LICENSE = GPLv2/LGPLv2
+
+GNU_CONFIGURE = 1
+
+CONFIGURE_ARGS = --disable-static
+CONFIGURE_ARGS += --enable-host-shared
+CONFIGURE_ARGS += --with-system-zlib
+CONFIGURE_ARGS += --enable-gold=yes
+
+include ../../mk/spksrc.archs.mk
+
+# embedspu is a tool to "Embed an SPU ELF executable into a PowerPC object file"
+# and hence built only for PPC_ARCHS.
+# gprofng fails to build on i686 and does not build on other 32-bit archs.
+ifeq ($(findstring $(ARCH),$(64bit_ARCHS)),$(ARCH))
+PLIST_TRANSFORM = sed -e '/bin\/embedspu/d'
+else
+CONFIGURE_ARGS += --disable-gprofng
+PLIST_TRANSFORM = sed -e '/bin\/gprofng/d' -e '/bin\/gp\-/d' -e '/lib\/gprofng/d'
+ifneq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
+PLIST_TRANSFORM += -e '/bin\/embedspu/d'
+endif
+endif
+
+# Avoid conflicts with gdb
+CONFIGURE_ARGS += --includedir=$(INSTALL_PREFIX)/include/binutils
+
+include ../../mk/spksrc.cross-cc.mk

cross/binutils-2.41/PLIST

@@ -0,0 +1,27 @@
+bin:bin/addr2line
+bin:bin/ar
+bin:bin/as
+bin:bin/c++filt
+bin:bin/dwp
+bin:bin/elfedit
+bin:bin/embedspu
+bin:bin/gp-archive
+bin:bin/gp-collect-app
+rsc:bin/gp-display-html
+bin:bin/gp-display-src
+bin:bin/gp-display-text
+bin:bin/gprof
+bin:bin/gprofng
+bin:bin/ld
+bin:bin/ld.bfd
+bin:bin/ld.gold
+bin:bin/nm
+bin:bin/objcopy
+bin:bin/objdump
+bin:bin/ranlib
+bin:bin/readelf
+bin:bin/size
+bin:bin/strings
+bin:bin/strip
+lib:lib/bfd-plugins/libdep.so
+lib:lib/gprofng/*.so

cross/binutils-2.41/digests

@@ -0,0 +1,3 @@
+binutils-2.41.tar.xz SHA1 0e008260a958bbd10182ee3384672ae0a310eece
+binutils-2.41.tar.xz SHA256 ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+binutils-2.41.tar.xz MD5 256d7e0ad998e423030c84483a7c1e30

cross/binutils-latest/Makefile

@@ -1,38 +1,39 @@
 PKG_NAME = binutils
-PKG_VERS = 2.40
+PKG_VERS = 2.42
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnu.org/gnu/binutils
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/zlib cross/mpfr
 
+# c++11 compiler is required (the real check is in cross/binutils/Makefile)
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS)
+
 HOMEPAGE = https://www.gnu.org/software/binutils/
 COMMENT = GNU Binutils
 LICENSE = GPLv2/LGPLv2
 
 GNU_CONFIGURE = 1
 
+CONFIGURE_ARGS = --disable-static
 CONFIGURE_ARGS += --enable-host-shared
 CONFIGURE_ARGS += --with-system-zlib
 CONFIGURE_ARGS += --enable-gold=yes
 
 include ../../mk/spksrc.archs.mk
 
-# embedspu is a tool to "Embed an SPU ELF executable into a PowerPC object file"
-# and hence built only for PPC_ARCHS.
-# gprofng fails to build on i686 and does not build on other 32-bit archs.
-ifeq ($(findstring $(ARCH),$(64bit_ARCHS)),$(ARCH))
-PLIST_TRANSFORM = sed -e '/bin\/embedspu/d'
-else
+# gprofng fails to build for i686 
+# ./../common/core_pcbe.c:2698:33: error: ‘PERF_COUNT_HW_REF_CPU_CYCLES’ undeclared here
+# gprofng is not built for other 32-bit archs
+ifeq ($(findstring $(ARCH),$(32bit_ARCHS)),$(ARCH))
 CONFIGURE_ARGS += --disable-gprofng
 PLIST_TRANSFORM = sed -e '/bin\/gprofng/d' -e '/bin\/gp\-/d' -e '/lib\/gprofng/d'
-ifneq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
-PLIST_TRANSFORM += -e '/bin\/embedspu/d'
-endif
 endif
 
 # Avoid conflicts with gdb
 CONFIGURE_ARGS += --includedir=$(INSTALL_PREFIX)/include/binutils
 
+ADDITIONAL_CXXFLAGS = -std=c++11
+
 include ../../mk/spksrc.cross-cc.mk

cross/binutils-latest/PLIST

@@ -4,7 +4,6 @@ bin:bin/as
 bin:bin/c++filt
 bin:bin/dwp
 bin:bin/elfedit
-bin:bin/embedspu
 bin:bin/gp-archive
 bin:bin/gp-collect-app
 rsc:bin/gp-display-html

cross/binutils-latest/digests

@@ -1,3 +1,3 @@
-binutils-2.40.tar.xz SHA1 fee4fbef9d632afc1988dd631d7f75d4394b7f8d
-binutils-2.40.tar.xz SHA256 0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
-binutils-2.40.tar.xz MD5 007b59bd908a737c06e5a8d3d2c737eb
+binutils-2.42.tar.xz SHA1 44da41792c60419863d7e13fa1deaf6b24dd69b8
+binutils-2.42.tar.xz SHA256 f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800
+binutils-2.42.tar.xz MD5 a075178a9646551379bfb64040487715

cross/binutils/Makefile

@@ -1,12 +1,15 @@
 PKG_NAME = binutils-main
 
 OPTIONAL_DEPENDS = cross/binutils-latest
+OPTIONAL_DEPENDS += cross/binutils-2.41
 OPTIONAL_DEPENDS += cross/binutils-2.32
 
 include ../../mk/spksrc.main-depends.mk
 
-ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
+ifeq ($(call version_lt, $(TC_GCC), 4.4),1)
 DEPENDS = cross/binutils-2.32
+else ifeq ($(call version_lt, $(TC_GCC), 4.8.1),1)
+DEPENDS = cross/binutils-2.41
 else
 DEPENDS = cross/binutils-latest
 endif

cross/gdb-latest/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = gdb
-PKG_VERS = 13.2
+PKG_VERS = 14.2
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnu.org/gnu/gdb

cross/gdb-latest/digests

@@ -1,3 +1,3 @@
-gdb-13.2.tar.xz SHA1 bcd6b05a2565f4339e1187dae428fb58a000d690
-gdb-13.2.tar.xz SHA256 fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a
-gdb-13.2.tar.xz MD5 fbd3cdae16c581e8a742cb766ba35076
+gdb-14.2.tar.xz SHA1 4f38f7c24d523b6923f22404b7dee4152a00d0d4
+gdb-14.2.tar.xz SHA256 2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772
+gdb-14.2.tar.xz MD5 4452f575d09f94276cb0a1e95ecff856

cross/mpfr/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = mpfr
-PKG_VERS = 4.2.0
+PKG_VERS = 4.2.1
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnu.org/gnu/mpfr
@@ -13,10 +13,6 @@ LICENSE = GNU Lesser GPL
 
 GNU_CONFIGURE = 1
 
-# Cumulative patches for version 4.1.1-p1
-# https://www.mpfr.org/mpfr-4.1.1/allpatches
-#PATCHES_LEVEL = 1
-
 CONFIGURE_ARGS = --with-gmp=$(STAGING_INSTALL_PREFIX)
 CONFIGURE_ARGS += --disable-static
 

cross/mpfr/PLIST

@@ -1,3 +1,3 @@
 lnk:lib/libmpfr.so
 lnk:lib/libmpfr.so.6
-lib:lib/libmpfr.so.6.2.0
+lib:lib/libmpfr.so.6.2.1

cross/mpfr/digests

@@ -1,3 +1,3 @@
-mpfr-4.2.0.tar.xz SHA1 4f734ca3ebceac28e2f944b131a47133b19e2c5e
-mpfr-4.2.0.tar.xz SHA256 06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993
-mpfr-4.2.0.tar.xz MD5 a25091f337f25830c16d2054d74b5af7
+mpfr-4.2.1.tar.xz SHA1 31ffb4244cb469e2b4937cce1f50150300971dfb
+mpfr-4.2.1.tar.xz SHA256 277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2
+mpfr-4.2.1.tar.xz MD5 523c50c6318dde6f9dc523bc0244690a

cross/strace/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = strace
-PKG_VERS = 6.5
+PKG_VERS = 6.9
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/strace/strace/releases/download/v$(PKG_VERS)

cross/strace/digests

@@ -1,3 +1,3 @@
-strace-6.5.tar.xz SHA1 9a887797c47a1d91e0c74bca4965f42204103ebf
-strace-6.5.tar.xz SHA256 dfb051702389e1979a151892b5901afc9e93bbc1c70d84c906ade3224ca91980
-strace-6.5.tar.xz MD5 e2a7651192053b4df3acd4cea0ec64ef
+strace-6.9.tar.xz SHA1 5e93f598be33815cf973038ef662a56388e1e2ae
+strace-6.9.tar.xz SHA256 da189e990a82e3ca3a5a4631012f7ecfd489dab459854d82d8caf6a865c1356a
+strace-6.9.tar.xz MD5 395900d4de0b6b8c4707045a9782134c

diyspk/autoconf/Makefile

@@ -0,0 +1,23 @@
+SPK_NAME = autoconf
+SPK_VERS = 2.72
+SPK_REV = 1
+
+DEPENDS = cross/autoconf
+
+MAINTAINER = SynoCommunity
+DESCRIPTION = Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code packages.
+LICENSE = GPLv2
+DISPLAY_NAME = autoconf
+STARTABLE = no
+
+HOMEPAGE = https://www.gnu.org/software/autoconf/
+
+SPK_COMMANDS = bin/autoconf
+SPK_COMMANDS += bin/autoheader
+SPK_COMMANDS += bin/autom4te
+SPK_COMMANDS += bin/autoreconf
+SPK_COMMANDS += bin/autoscan
+SPK_COMMANDS += bin/autoupdate
+SPK_COMMANDS += bin/ifnames
+
+include ../../mk/spksrc.spk.mk

diyspk/binutils/Makefile

@@ -1,5 +1,5 @@
 SPK_NAME = binutils
-SPK_VERS = 2.40
+SPK_VERS = 2.42
 SPK_REV = 1
 
 DEPENDS = cross/binutils
@@ -11,6 +11,30 @@ STARTABLE = no
 HOMEPAGE = https://www.gnu.org/software/binutils/
 LICENSE = GPLv2/LGPLv2
 
-SPK_COMMANDS = bin/strace bin/strace-log-merge
+SPK_COMMANDS = bin/addr2line
+SPK_COMMANDS += bin/ar
+SPK_COMMANDS += bin/as
+SPK_COMMANDS += bin/c++filt
+SPK_COMMANDS += bin/dwp
+SPK_COMMANDS += bin/elfedit
+SPK_COMMANDS += bin/embedspu
+SPK_COMMANDS += bin/gp-archive
+SPK_COMMANDS += bin/gp-collect-app
+SPK_COMMANDS += bin/gp-display-html
+SPK_COMMANDS += bin/gp-display-src
+SPK_COMMANDS += bin/gp-display-text
+SPK_COMMANDS += bin/gprof
+SPK_COMMANDS += bin/gprofng
+SPK_COMMANDS += bin/ld
+SPK_COMMANDS += bin/ld.bfd
+SPK_COMMANDS += bin/ld.gold
+SPK_COMMANDS += bin/nm
+SPK_COMMANDS += bin/objcopy
+SPK_COMMANDS += bin/objdump
+SPK_COMMANDS += bin/ranlib
+SPK_COMMANDS += bin/readelf
+SPK_COMMANDS += bin/size
+SPK_COMMANDS += bin/strings
+SPK_COMMANDS += bin/strip
 
 include ../../mk/spksrc.spk.mk

diyspk/gdb/Makefile

@@ -4,19 +4,17 @@ SPK_ICON = src/gdb.png
 
 DEPENDS = cross/gdb
 
-include ../../mk/spksrc.archs.mk
+include ../../mk/spksrc.common.mk
 ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
 SPK_VERS = 7.12.1
-else
-ifeq ($(call version_lt, $(TC_GCC), 4.8),1)
+else ifeq ($(call version_lt, $(TC_GCC), 4.8),1)
 SPK_VERS = 7.12.1
 else
-SPK_VERS = 13.2
-endif
+SPK_VERS = 14.2
 endif
 
 MAINTAINER = th0ma7
-DESCRIPTION = The GNU Debugger (GDB) is a portable debugger that runs on many Unix-like systems and works for many programming languages, including Ada, C, C++, Objective-C, Free Pascal, Fortran, Go and partially others.
+DESCRIPTION = The GNU Debugger \(GDB\) is a portable debugger that runs on many Unix-like systems and works for many programming languages, including Ada, C, C++, Objective-C, Free Pascal, Fortran, Go and partially others.
 STARTABLE = no
 
 HOMEPAGE = https://www.sourceware.org/gdb/

diyspk/strace/Makefile

@@ -1,5 +1,5 @@
 SPK_NAME = strace
-SPK_VERS = 6.4
+SPK_VERS = 6.9
 SPK_REV = 1
 
 DEPENDS = cross/strace

spk/synocli-devel/Makefile

@@ -1,8 +1,8 @@
 SPK_NAME = synocli-devel
-SPK_VERS = 1.2
-SPK_REV = 3
+SPK_VERS = 1.3
+SPK_REV = 4
 SPK_ICON = src/synocli-devel.png
-CHANGELOG = "1. Update strace to v6.5.<br/>2. Add support for PPC archs."
+CHANGELOG = "1. Fix autoconf to use installed m4 command.<br/>2. Update autoconf to v2.72.<br/>3. Update binutils to v2.42.<br/>4. Update gdb to v14.2.<br/>5. Update strace to v6.9."
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = SynoCli Development Tools provides a set of command-line utilities for system development and debugging: automake 1.65.5, autoconf 2.71, binutils 2.40$(OPTIONAL_DESC), make 4.4.1, pkg-config 0.29.2, libtree 3.1.1, strace 6.5