Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

synocli-devel update - Add libtool and strace #5824

Merged
merged 21 commits into from
Aug 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions cross/binutils/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PKG_NAME = binutils
PKG_VERS = 2.39
PKG_VERS = 2.40
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://ftp.gnu.org/gnu/binutils/
PKG_DIST_SITE = https://ftp.gnu.org/gnu/binutils
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/zlib cross/gmp cross/mpfr
Expand All @@ -18,11 +18,14 @@ include ../../mk/spksrc.archs.mk
CONFIGURE_ARGS += --enable-host-shared
CONFIGURE_ARGS += --with-system-zlib
CONFIGURE_ARGS += --enable-gold=yes
# Fails to build on i686
ifeq ($(findstring $(ARCH),$(i686_ARCHS)),$(ARCH))
CONFIGURE_ARGS += --enable-gprofng=no

# Fails to build on i686 and does not build on other 32-bit archs
ifneq ($(findstring $(ARCH),$(64bit_ARCHS)),$(ARCH))
CONFIGURE_ARGS += --disable-gprofng
PLIST_TRANSFORM = sed -e '/bin\/gprofng/d' -e '/bin\/gp\-/d' -e '/lib\/gprofng/d'
endif
# Otherwise conflicts with gdb

# Avoid conflicts with gdb
CONFIGURE_ARGS += --includedir=$(INSTALL_PREFIX)/include/binutils

include ../../mk/spksrc.cross-cc.mk
13 changes: 11 additions & 2 deletions cross/binutils/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,16 @@ bin:bin/as
bin:bin/c++filt
bin:bin/dwp
bin:bin/elfedit
bin:bin/gp*
bin:bin/ld*
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
Expand All @@ -15,3 +23,4 @@ bin:bin/size
bin:bin/strings
bin:bin/strip
lib:lib/bfd-plugins/libdep.so
lib:lib/gprofng/*.so
6 changes: 3 additions & 3 deletions cross/binutils/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
binutils-2.39.tar.xz SHA1 f17653e7b1d1fa5242a408919845da23e8cc5141
binutils-2.39.tar.xz SHA256 645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
binutils-2.39.tar.xz MD5 f7e986ae9ff06405cafb2e585ee36d27
binutils-2.40.tar.xz SHA1 fee4fbef9d632afc1988dd631d7f75d4394b7f8d
binutils-2.40.tar.xz SHA256 0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
binutils-2.40.tar.xz MD5 007b59bd908a737c06e5a8d3d2c737eb
2 changes: 1 addition & 1 deletion cross/gdb-7.12/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bin:bin/gcore
rsc:bin/gcore
bin:bin/gdb
bin:bin/gdbserver
bin:bin/run
Expand Down
2 changes: 1 addition & 1 deletion cross/gdb-latest/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = gdb
PKG_VERS = 13.1
PKG_VERS = 13.2
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://ftp.gnu.org/gnu/gdb
Expand Down
4 changes: 2 additions & 2 deletions cross/gdb-latest/PLIST
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
bin:bin/gcore
rsc:bin/gcore
bin:bin/gdb
bin:bin/gdb-add-index
rsc:bin/gdb-add-index
bin:bin/gdbserver
bin:bin/run
lib:lib/libinproctrace.so
6 changes: 3 additions & 3 deletions cross/gdb-latest/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gdb-13.1.tar.xz SHA1 6f0f5f905085f447672d9f52af66b42207d56e46
gdb-13.1.tar.xz SHA256 115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0
gdb-13.1.tar.xz MD5 4aaad768ff2585464173c091947287ec
gdb-13.2.tar.xz SHA1 bcd6b05a2565f4339e1187dae428fb58a000d690
gdb-13.2.tar.xz SHA256 fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a
gdb-13.2.tar.xz MD5 fbd3cdae16c581e8a742cb766ba35076
48 changes: 48 additions & 0 deletions cross/glibc-2.28/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
PKG_NAME = glibc
PKG_VERS = 2.28
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://ftp.gnu.org/gnu/glibc/
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = https://www.gnu.org/software/libc/
COMMENT = The GNU C Library (glibc)
LICENSE = GPLv2/LGPLv2

GNU_CONFIGURE = 1

include ../../mk/spksrc.archs.mk

CONFIGURE_TARGET = glibc_configure_target
COMPILE_TARGET = glibc_compile_taget
INSTALL_TARGET = glibc_install_target

CONFIGURE_ARGS = --enable-shared
CONFIGURE_ARGS += --enable-kernel=$(word 1,$(subst ., ,$(TC_KERNEL))).$(word 2,$(subst ., ,$(TC_KERNEL)))
CONFIGURE_ARGS += --disable-timezone-tools
CONFIGURE_ARGS += --disable-crypt
CONFIGURE_ARGS += --disable-build-nscd
CONFIGURE_ARGS += --disable-nscd
CONFIGURE_ARGS += --disable-werror
CONFIGURE_ARGS += --enable-stack-protector=strong
CONFIGURE_ARGS += --with-headers=$(TC_SYSROOT)/usr/include
CONFIGURE_ARGS += ac_cv_prog_MAKEINFO=false

ADDITIONAL_CFLAGS = -O2

include ../../mk/spksrc.cross-cc.mk

.PHONY: glibc_configure_target
glibc_configure_target:
@mkdir $(WORK_DIR)/$(PKG_DIR)-build
$(RUN) && cd ../$(PKG_DIR)-build && env $(ENV) ../$(PKG_DIR)/configure $(REAL_CONFIGURE_ARGS)

.PHONY: glibc_compile_taget
glibc_compile_taget:
@$(RUN) && cd ../$(PKG_DIR)-build && env $(ENV) $(PSTAT_TIME) $(MAKE) -j$(NCPUS) $(COMPILE_MAKE_OPTIONS)

.PHONY: glibc_install_target
glibc_install_target:
@$(RUN) && cd ../$(PKG_DIR)-build && env $(ENV) $(MAKE) install DESTDIR=$(INSTALL_DIR)
Empty file added cross/glibc-2.28/PLIST.auto
Empty file.
3 changes: 3 additions & 0 deletions cross/glibc-2.28/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
glibc-2.28.tar.xz SHA1 ccb5dc9e51a9884df8488f86982439d47b283b2a
glibc-2.28.tar.xz SHA256 b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082
glibc-2.28.tar.xz MD5 c81d2388896379997bc359d4f2084239
48 changes: 48 additions & 0 deletions cross/glibc-latest/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
PKG_NAME = glibc
PKG_VERS = 2.37
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://ftp.gnu.org/gnu/glibc/
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = https://www.gnu.org/software/libc/
COMMENT = The GNU C Library (glibc)
LICENSE = GPLv2/LGPLv2

GNU_CONFIGURE = 1

include ../../mk/spksrc.archs.mk

CONFIGURE_TARGET = glibc_configure_target
COMPILE_TARGET = glibc_compile_taget
INSTALL_TARGET = glibc_install_target

CONFIGURE_ARGS = --enable-shared
CONFIGURE_ARGS += --enable-kernel=$(word 1,$(subst ., ,$(TC_KERNEL))).$(word 2,$(subst ., ,$(TC_KERNEL)))
CONFIGURE_ARGS += --disable-timezone-tools
CONFIGURE_ARGS += --disable-crypt
CONFIGURE_ARGS += --disable-build-nscd
CONFIGURE_ARGS += --disable-nscd
CONFIGURE_ARGS += --disable-werror
CONFIGURE_ARGS += --enable-stack-protector=strong
CONFIGURE_ARGS += --with-headers=$(TC_SYSROOT)/usr/include
CONFIGURE_ARGS += ac_cv_prog_MAKEINFO=false

ADDITIONAL_CFLAGS = -O2

include ../../mk/spksrc.cross-cc.mk

.PHONY: glibc_configure_target
glibc_configure_target:
@mkdir $(WORK_DIR)/$(PKG_DIR)-build
@$(RUN) && cd ../$(PKG_DIR)-build && env $(ENV) ../$(PKG_DIR)/configure $(REAL_CONFIGURE_ARGS)

.PHONY: glibc_compile_taget
glibc_compile_taget:
@$(RUN) && cd ../$(PKG_DIR)-build && env $(ENV) $(PSTAT_TIME) $(MAKE) -j$(NCPUS) $(COMPILE_MAKE_OPTIONS)

.PHONY: glibc_install_target
glibc_install_target:
@$(RUN) && cd ../$(PKG_DIR)-build && env $(ENV) $(MAKE) install DESTDIR=$(INSTALL_DIR)
Empty file added cross/glibc-latest/PLIST.auto
Empty file.
3 changes: 3 additions & 0 deletions cross/glibc-latest/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
glibc-2.37.tar.xz SHA1 3b85fa6230dfbf34c3ab5af3b59d65bd68601579
glibc-2.37.tar.xz SHA256 2257eff111a1815d74f46856daaf40b019c1e553156c69d48ba0cbfc1bb91a43
glibc-2.37.tar.xz MD5 e89cf3dcb64939d29f04b4ceead5cc4e
23 changes: 23 additions & 0 deletions cross/glibc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
PKG_NAME = glibc-main

HOMEPAGE = https://www.gnu.org/software/libc/
COMMENT = The GNU C Library (glibc)
LICENSE = GPLv2/LGPLv2

DOWNLOAD_TARGET = nop
CHECKSUM_TARGET = nop
EXTRACT_TARGET = nop
CONFIGURE_TARGET = nop
COMPILE_TARGET = nop
INSTALL_TARGET = nop

OPTIONAL_DEPENDS = cross/glibc-latest
OPTIONAL_DEPENDS += cross/glibc-2.28

include ../../mk/spksrc.install-resources.mk

ifeq ($(call version_ge, $(TC_GCC), 5.1),1)
DEPENDS = cross/glibc-latest
else
DEPENDS = cross/glibc-2.28
endif
Empty file added cross/glibc/PLIST
Empty file.
Empty file added cross/glibc/digests
Empty file.
18 changes: 18 additions & 0 deletions cross/libtree/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
PKG_NAME = libtree
PKG_VERS = 3.1.1
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/haampie/libtree/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = https://github.com/haampie/libtree
COMMENT = A tool that turns ldd into a tree and explains how shared libraries are found or why they cannot be located.
LICENSE = MIT

CONFIGURE_TARGET = nop
INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX)

include ../../mk/spksrc.cross-cc.mk
1 change: 1 addition & 0 deletions cross/libtree/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin:bin/libtree
3 changes: 3 additions & 0 deletions cross/libtree/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
libtree-3.1.1.tar.gz SHA1 591b11a3eba735132c8e38e9ea7d75bf14294618
libtree-3.1.1.tar.gz SHA256 6148436f54296945d22420254dd78e1829d60124bb2f5b9881320a6550f73f5c
libtree-3.1.1.tar.gz MD5 03d64114e732a7e0a7fcb32ab3562ffb
8 changes: 7 additions & 1 deletion cross/llvm-latest/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = llvm
PKG_VERS = 16.0.1
PKG_VERS = 16.0.6
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-project-$(PKG_VERS).src.$(PKG_EXT)
PKG_DIST_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(PKG_VERS)
Expand All @@ -13,6 +13,8 @@ REQUIRED_MIN_DSM = 7.0
UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(PPC_ARCHS) comcerto2k
CMAKE_USE_NINJA = 1

POST_INSTALL_TARGET = llvm_post_install

# Using LLVM project source need to change to llvm sub-directory
CMAKE_DIR = $(WORK_DIR)/$(PKG_DIR)/llvm

Expand Down Expand Up @@ -107,3 +109,7 @@ CMAKE_ARGS += -DLLVM_ENABLE_PROJECTS='clang;compiler-rt;lld'
endif

include ../../mk/spksrc.cross-cmake.mk

.PHONY: llvm_post_install
llvm_post_install:
$(RUN) && cd $(STAGING_INSTALL_PREFIX)/bin && ln -s llvm-readobj llvm-readelf
6 changes: 3 additions & 3 deletions cross/llvm-latest/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
llvm-project-16.0.1.src.tar.xz SHA1 e9a008977aa3a0ce1d17436579236de49a812201
llvm-project-16.0.1.src.tar.xz SHA256 ab7e3b95adb88fd5b669ca8c1d3c1e8d2a601c4478290d3ae31d8d70e96f2064
llvm-project-16.0.1.src.tar.xz MD5 5600e75a693dbbbf0a542e4bdeadc494
llvm-project-16.0.6.src.tar.xz SHA1 92eaedd6f1dde08751441afcd0a3d0fbfdf95d42
llvm-project-16.0.6.src.tar.xz SHA256 ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e
llvm-project-16.0.6.src.tar.xz MD5 dc13938a604f70379d3b38d09031de98
2 changes: 2 additions & 0 deletions cross/llvm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ HOMEPAGE = https://www.gnu.org/software/gdb/
COMMENT = The GNU Project Debugger
LICENSE = GPLv2/LGPLv2

UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(PPC_ARCHS)

DOWNLOAD_TARGET = nop
CHECKSUM_TARGET = nop
EXTRACT_TARGET = nop
Expand Down
50 changes: 50 additions & 0 deletions cross/strace/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
PKG_NAME = strace
PKG_VERS = 6.4
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)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = https://strace.io/
COMMENT = strace is a diagnostic, debugging and instructional userspace utility for Linux.
LICENSE = GPLv2+

GNU_CONFIGURE = 1

# strace uses its own ARCH definition
# ARCH is `x86_64', `i386', `aarch64', `powerpc64le', etc.
include ../../mk/spksrc.archs.mk

STRACE_ARCH =
ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
STRACE_ARCH = x86_64
endif
ifeq ($(findstring $(ARCH),$(i686_ARCHS)),$(ARCH))
STRACE_ARCH = i386
endif
ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
STRACE_ARCH = arm
endif
ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS) $(ARMv7L_ARCHS)),$(ARCH))
STRACE_ARCH = arm
endif
ifeq ($(findstring $(ARCH),$(ARMv8_ARCHS)),$(ARCH))
STRACE_ARCH = aarch64
CONFIGURE_ARGS = --disable-mpers
endif
ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
STRACE_ARCH = powerpc
endif

ifeq ($(strip $(STRACE_ARCH)),)
# Unexpected CPU architecture.
$(error Arch $(ARCH) not expected)
endif

CONFIGURE_ARGS += ARCH=$(STRACE_ARCH)
COMPILE_MAKE_OPTIONS = ARCH=$(STRACE_ARCH)
INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR) prefix=$(INSTALL_PREFIX) ARCH=$(STRACE_ARCH)

include ../../mk/spksrc.cross-cc.mk
2 changes: 2 additions & 0 deletions cross/strace/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bin:bin/strace
rsc:bin/strace-log-merge
3 changes: 3 additions & 0 deletions cross/strace/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
strace-6.4.tar.xz SHA1 e8e1e23f8d731c6c81eb929e6454846f01bad2ff
strace-6.4.tar.xz SHA256 27987dbac57fdfd260c6db4dc8328df35c95c6867c8a3d4371d59cdcf4eb9238
strace-6.4.tar.xz MD5 b6e5842f27b5cc9022c8bd7238435a6a
17 changes: 17 additions & 0 deletions diyspk/binutils/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
SPK_NAME = binutils
SPK_VERS = 2.40
SPK_REV = 1

DEPENDS = cross/binutils

MAINTAINER = SynoCommunity
DESCRIPTION = GNU Binutils
DISPLAY_NAME = binutils
STARTABLE = no

HOMEPAGE = https://www.gnu.org/software/binutils/
LICENSE = GPLv2/LGPLv2

SPK_COMMANDS = bin/strace bin/strace-log-merge

include ../../mk/spksrc.spk.mk
17 changes: 17 additions & 0 deletions diyspk/libtree/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
SPK_NAME = libtree
SPK_VERS = 3.1.1
SPK_REV = 1

DEPENDS = cross/libtree

MAINTAINER = SynoCommunity
DESCRIPTION = A tool that turns ldd into a tree and explains how shared libraries are found or why they cannot be located.
DISPLAY_NAME = libtree
STARTABLE = no

HOMEPAGE = https://github.com/haampie/libtree
LICENSE = MIT

SPK_COMMANDS = bin/libtree

include ../../mk/spksrc.spk.mk
17 changes: 17 additions & 0 deletions diyspk/strace/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
SPK_NAME = strace
SPK_VERS = 6.4
SPK_REV = 1

DEPENDS = cross/strace

MAINTAINER = SynoCommunity
DESCRIPTION = strace is a diagnostic, debugging and instructional userspace utility for Linux.
DISPLAY_NAME = strace
STARTABLE = no

HOMEPAGE = https://strace.io/
LICENSE = GPLv2+

SPK_COMMANDS = bin/strace bin/strace-log-merge

include ../../mk/spksrc.spk.mk