diff --git a/lang/golang/golang-compiler.mk b/lang/golang/golang-compiler.mk index 144f2a4af..50cc44905 100644 --- a/lang/golang/golang-compiler.mk +++ b/lang/golang/golang-compiler.mk @@ -60,9 +60,10 @@ define GoCompiler/Default/Install/Bin $(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),api) + $(INSTALL_DATA) -p "$(1)/go.env" "$(2)/lib/go-$(3)/" $(INSTALL_DATA) -p "$(1)/VERSION" "$(2)/lib/go-$(3)/" - for file in AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE PATENTS README.md SECURITY.md; do \ + for file in CONTRIBUTING.md LICENSE PATENTS README.md SECURITY.md; do \ if [ -f "$(1)/$$$$file" ]; then \ $(INSTALL_DATA) -p "$(1)/$$$$file" "$(2)/share/go-$(3)/" ; \ fi ; \ diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk index 4f164c4c1..cc0050536 100644 --- a/lang/golang/golang-package.mk +++ b/lang/golang/golang-package.mk @@ -215,7 +215,8 @@ GO_PKG_BUILD_VARS= \ GOPATH="$(GO_PKG_BUILD_DIR)" \ GOCACHE="$(GO_BUILD_CACHE_DIR)" \ GOMODCACHE="$(GO_MOD_CACHE_DIR)" \ - GOENV=off + GOENV=off \ + GOTOOLCHAIN=local GO_PKG_VARS= \ $(GO_PKG_TARGET_VARS) \ diff --git a/lang/golang/golang-values.mk b/lang/golang/golang-values.mk index 469629b7e..1584d22fc 100644 --- a/lang/golang/golang-values.mk +++ b/lang/golang/golang-values.mk @@ -29,6 +29,7 @@ unexport \ GOOS \ GOPATH \ GOROOT \ + GOTOOLCHAIN \ GOTMPDIR \ GOWORK # Unmodified: @@ -219,7 +220,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \ \ aix_ppc64 \ \ - linux_ppc64le linux_riscv64 linux_s390x + linux_loong64 linux_ppc64le linux_riscv64 linux_s390x # From https://go.dev/src/cmd/go/internal/work/init.go go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm windows_arm64),,shared) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 0d89cea90..1022a6456 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk -GO_VERSION_MAJOR_MINOR:=1.20 -GO_VERSION_PATCH:=7 +GO_VERSION_MAJOR_MINOR:=1.21 +GO_VERSION_PATCH:=0 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597 +PKG_HASH:=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause @@ -62,6 +62,7 @@ HOST_GO_VALID_OS_ARCH:= \ \ aix_ppc64 \ js_wasm \ + wasip1_wasm \ \ freebsd_riscv64 \ \ @@ -296,7 +297,7 @@ $(eval $(call GoCompiler/AddProfile,Package,$(PKG_BUILD_DIR),$(PKG_GO_PREFIX),$( PKG_GO_ZBOOTSTRAP_MODS:= \ s/defaultGO386 = `[^`]*`/defaultGO386 = `$(or $(GO_386),sse2)`/; \ s/defaultGOAMD64 = `[^`]*`/defaultGOAMD64 = `$(or $(GO_AMD64),v1)`/; \ - s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),5)`/; \ + s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),7)`/; \ s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(or $(GO_MIPS),hardfloat)`/; \ s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(or $(GO_MIPS64),hardfloat)`/; \ s/defaultGOPPC64 = `[^`]*`/defaultGOPPC64 = `$(or $(GO_PPC64),power8)`/; diff --git a/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch b/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch deleted file mode 100644 index aecf5309f..000000000 --- a/lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5ccf9f47bf4f5ba53e0ab7338a7fd4626714cfb2 Mon Sep 17 00:00:00 2001 -From: Jeffery To -Date: Tue, 23 Nov 2021 15:05:37 +0800 -Subject: [PATCH] cmd/link: use gold on ARM/ARM64 only if gold is available - -COPY relocation handling on ARM/ARM64 has been fixed in recent versions -of the GNU linker. This switches to gold only if gold is available. - -Fixes #22040. ---- - src/cmd/link/internal/ld/lib.go | 19 +++++++------------ - 1 file changed, 7 insertions(+), 12 deletions(-) - ---- a/src/cmd/link/internal/ld/lib.go -+++ b/src/cmd/link/internal/ld/lib.go -@@ -1548,25 +1548,20 @@ func (ctxt *Link) hostlink() { - } - - if ctxt.Arch.InFamily(sys.ARM, sys.ARM64) && buildcfg.GOOS == "linux" { -- // On ARM, the GNU linker will generate COPY relocations -- // even with -znocopyreloc set. -+ // On ARM, older versions of the GNU linker will generate -+ // COPY relocations even with -znocopyreloc set. - // https://sourceware.org/bugzilla/show_bug.cgi?id=19962 - // -- // On ARM64, the GNU linker will fail instead of -- // generating COPY relocations. -+ // On ARM64, older versions of the GNU linker will fail -+ // instead of generating COPY relocations. - // -- // In both cases, switch to gold. -- altLinker = "gold" -- -- // If gold is not installed, gcc will silently switch -- // back to ld.bfd. So we parse the version information -- // and provide a useful error if gold is missing. -+ // In both cases, switch to gold if gold is available. - name, args := flagExtld[0], flagExtld[1:] - args = append(args, "-fuse-ld=gold", "-Wl,--version") - cmd := exec.Command(name, args...) - if out, err := cmd.CombinedOutput(); err == nil { -- if !bytes.Contains(out, []byte("GNU gold")) { -- log.Fatalf("ARM external linker must be gold (issue #15696), but is not: %s", out) -+ if bytes.Contains(out, []byte("GNU gold")) { -+ altLinker = "gold" - } - } - } diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 6e16b86d7..1d955f9d6 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruby PKG_VERSION:=3.2.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 # First two numbes PKG_ABI_VERSION:=$(subst $(space),.,$(wordlist 1, 2, $(subst .,$(space),$(PKG_VERSION)))) diff --git a/lang/ruby/patches/010-fix-riscv64-build.patch b/lang/ruby/patches/010-fix-riscv64-build.patch new file mode 100644 index 000000000..16ff6df95 --- /dev/null +++ b/lang/ruby/patches/010-fix-riscv64-build.patch @@ -0,0 +1,33 @@ +From dfb22e4d6662bf72879eda806eaa78c7b52b519e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 25 Jan 2022 20:29:14 -0800 +Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv + +These defines are missing in musl, there is a possible +patch to add them to musl, but we need a full list of +these names for mcontext that can be added once for all + +Upstream-Status: Inappropriate [musl bug] +Signed-off-by: Khem Raj +--- + vm_dump.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/vm_dump.c ++++ b/vm_dump.c +@@ -39,6 +39,15 @@ + + #define MAX_POSBUF 128 + ++#ifdef __riscv ++#ifndef REG_S1 ++#define REG_S1 9 ++#endif ++#ifndef REG_S2 ++#define REG_S2 18 ++#endif ++#endif ++ + #define VM_CFP_CNT(ec, cfp) \ + ((rb_control_frame_t *)((ec)->vm_stack + (ec)->vm_stack_size) - \ + (rb_control_frame_t *)(cfp)) diff --git a/libs/boost/Makefile b/libs/boost/Makefile index aecf1dc8a..e1e2f2b02 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -11,13 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=boost -PKG_VERSION:=1.82.0 -PKG_SOURCE_VERSION:=1_82_0 +PKG_VERSION:=1.83.0 +PKG_SOURCE_VERSION:=1_83_0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://boostorg.jfrog.io/artifactory/main/release/$(PKG_VERSION)/source/ -PKG_HASH:=a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 +PKG_HASH:=6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e PKG_MAINTAINER:=Carlos M. Ferreira PKG_LICENSE:=BSL-1.0 @@ -42,7 +42,7 @@ define Package/boost/Default endef define Package/boost/description -This package provides the Boost v1.82.0 libraries. +This package provides the Boost v1.83.0 libraries. Boost is a set of free, peer-reviewed, portable C++ source libraries. This package provides the following run-time libraries: @@ -78,7 +78,7 @@ This package provides the following run-time libraries: - wave There are many more header-only libraries supported by Boost. -See more at http://www.boost.org/doc/libs/1_82_0/ +See more at http://www.boost.org/doc/libs/1_83_0/ endef PKG_BUILD_DEPENDS:=boost/host diff --git a/libs/boost/patches/010-mips1.patch b/libs/boost/patches/010-mips1.patch deleted file mode 100644 index a5ec04d20..000000000 --- a/libs/boost/patches/010-mips1.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/boostcpp.jam -+++ b/boostcpp.jam -@@ -634,7 +634,7 @@ rule address-model ( ) - return @boostcpp.deduce-address-model ; - } - --local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ; -+local deducable-architectures = arm mips power riscv s390x sparc x86 combined ; - feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ; - for a in $(deducable-architectures) - { -@@ -645,10 +645,10 @@ rule deduce-architecture ( properties * - { - local result ; - local filtered = [ toolset-properties $(properties) ] ; -- local names = arm mips1 power riscv s390x sparc x86 combined ; -+ local names = arm mips power riscv s390x sparc x86 combined ; - local idx = [ configure.find-builds "default architecture" : $(filtered) - : /boost/architecture//arm -- : /boost/architecture//mips1 -+ : /boost/architecture//mips - : /boost/architecture//power - : /boost/architecture//riscv - : /boost/architecture//s390x ---- a/libs/atomic/build/atomic-arch-config.jam -+++ b/libs/atomic/build/atomic-arch-config.jam -@@ -27,9 +27,9 @@ rule deduce-architecture ( properties * - { - return arm ; - } -- else if [ configure.builds /boost/architecture//mips1 : $(properties) : "mips1" ] -+ else if [ configure.builds /boost/architecture//mips : $(properties) : "mips" ] - { -- return mips1 ; -+ return mips ; - } - else if [ configure.builds /boost/architecture//power : $(properties) : "power" ] - { diff --git a/net/tgt/Makefile b/net/tgt/Makefile index 8939d51d1..70ff9a1ea 100644 --- a/net/tgt/Makefile +++ b/net/tgt/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tgt -PKG_VERSION:=1.0.86 +PKG_VERSION:=1.0.87 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fujita/tgt/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=af84c16bf8893d65666afcc0424b46dafddd2d0e5dcf818b319ea9ed3c3315a7 +PKG_HASH:=975bb23b4762f2e2a8e787b79afa7fb44442c5afabaea0e469fca0169826077a PKG_MAINTAINER:=Maxim Storchak PKG_LICENSE:=GPL-2.0-only diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index 267272050..e4f5fe0d4 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.20.2 +PKG_VERSION:=2.20.3 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? -PKG_HASH:=f7aa0fd19fe457cb0310e3049f57253bddbf896a366824c3cd084a754967fb59 +PKG_HASH:=af8025623de3991a15a89575ae4fc4f3f38a17311af9641815500c01f0775950 PKG_MAINTAINER:=Javier Marcet diff --git a/utils/reptyr/Makefile b/utils/reptyr/Makefile index 191020747..6bf94b535 100644 --- a/utils/reptyr/Makefile +++ b/utils/reptyr/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=reptyr -PKG_VERSION:=0.8.0 -PKG_RELEASE:=5 +PKG_VERSION:=0.10.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/nelhage/reptyr/archive/ -PKG_HASH:=4b470ed2a0d25fed591739fa9613ce7ad3d0377891eb56cbe914e3c85db46ca8 +PKG_HASH:=c6ffbc34a511ac00d072219bda30699e51f2f4eb483cbae9e32e981d49e8b380 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Josef Schlehofer diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile index 0536ca35f..1efe5b381 100644 --- a/utils/smartmontools/Makefile +++ b/utils/smartmontools/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smartmontools -PKG_VERSION:=7.3 -PKG_RELEASE:=2 +PKG_VERSION:=7.4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/smartmontools -PKG_HASH:=a544f8808d0c58cfb0e7424ca1841cb858a974922b035d505d4e4c248be3a22b +PKG_HASH:=e9a61f641ff96ca95319edfb17948cd297d0cd3342736b2c49c99d4716fb993d PKG_MAINTAINER:=Maxim Storchak PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/smartmontools/patches/002-os_mailer-is-mailx.patch b/utils/smartmontools/patches/002-os_mailer-is-mailx.patch index 1bec1bfda..3fdd20064 100644 --- a/utils/smartmontools/patches/002-os_mailer-is-mailx.patch +++ b/utils/smartmontools/patches/002-os_mailer-is-mailx.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -7633,7 +7633,7 @@ releaseversion='${PACKAGE}-${VERSION}' +@@ -7682,7 +7682,7 @@ fi # Set platform-specific modules and symbols os_libs= os_dltools='curl wget lynx svn'