diff options
Diffstat (limited to 'lang')
-rw-r--r-- | lang/gcc13-devel/Makefile | 2 | ||||
-rw-r--r-- | lang/gcc13-devel/distinfo | 6 | ||||
-rw-r--r-- | lang/gcc14-devel/Makefile | 2 | ||||
-rw-r--r-- | lang/gcc14-devel/distinfo | 6 | ||||
-rw-r--r-- | lang/gcc14/Makefile | 6 | ||||
-rw-r--r-- | lang/gcc14/pkg-help | 5 | ||||
-rw-r--r-- | lang/gcc15-devel/Makefile | 2 | ||||
-rw-r--r-- | lang/gcc15-devel/distinfo | 6 | ||||
-rw-r--r-- | lang/gcc15/Makefile | 8 | ||||
-rw-r--r-- | lang/gcc15/pkg-help | 5 | ||||
-rw-r--r-- | lang/gcc16-devel/Makefile | 2 | ||||
-rw-r--r-- | lang/gcc16-devel/distinfo | 6 | ||||
-rw-r--r-- | lang/rust-nightly/Makefile | 8 | ||||
-rw-r--r-- | lang/rust-nightly/distinfo | 18 | ||||
-rw-r--r-- | lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs | 10 | ||||
-rw-r--r-- | lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs | 22 | ||||
-rw-r--r-- | lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs | 23 | ||||
-rw-r--r-- | lang/rust-nightly/files/patch-vendor_cc.rs | 16 | ||||
-rw-r--r-- | lang/rust/Makefile | 2 |
19 files changed, 94 insertions, 61 deletions
diff --git a/lang/gcc13-devel/Makefile b/lang/gcc13-devel/Makefile index 24cc3998eb53..67573a202db5 100644 --- a/lang/gcc13-devel/Makefile +++ b/lang/gcc13-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= gcc -PORTVERSION= 13.4.1.s20250828 +PORTVERSION= 13.4.1.s20250904 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc13-devel/distinfo b/lang/gcc13-devel/distinfo index f56691160d8f..c74b11b58d13 100644 --- a/lang/gcc13-devel/distinfo +++ b/lang/gcc13-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756456800 -SHA256 (gcc-13-20250828.tar.xz) = 54322d4375c3a255782afc17841d8fbb3d7ecc1162aeec74722b20c0140753a5 -SIZE (gcc-13-20250828.tar.xz) = 84598544 +TIMESTAMP = 1757064391 +SHA256 (gcc-13-20250904.tar.xz) = 841d59760c42108a706f70091cf1bd4865c8f3ec856a6eac451e75bec8caecff +SIZE (gcc-13-20250904.tar.xz) = 84591864 diff --git a/lang/gcc14-devel/Makefile b/lang/gcc14-devel/Makefile index 12619aff774d..ba6a1f1d927d 100644 --- a/lang/gcc14-devel/Makefile +++ b/lang/gcc14-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= gcc -PORTVERSION= 14.3.1.s20250829 +PORTVERSION= 14.3.1.s20250905 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} diff --git a/lang/gcc14-devel/distinfo b/lang/gcc14-devel/distinfo index fcdb8f253ed5..06fc1101802e 100644 --- a/lang/gcc14-devel/distinfo +++ b/lang/gcc14-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756543273 -SHA256 (gcc-14-20250829.tar.xz) = 872fbeb615f349066de09948aeccfb996bd4f5e6e1f6c7630d0f2d3f302b5481 -SIZE (gcc-14-20250829.tar.xz) = 88313104 +TIMESTAMP = 1757406221 +SHA256 (gcc-14-20250905.tar.xz) = e9000fb33a0f080e5e1bd3423ba35382c5426177cf4527e62fda429f78a7faf2 +SIZE (gcc-14-20250905.tar.xz) = 88344720 diff --git a/lang/gcc14/Makefile b/lang/gcc14/Makefile index 29e119905af3..3f2d7cf4848d 100644 --- a/lang/gcc14/Makefile +++ b/lang/gcc14/Makefile @@ -80,7 +80,11 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} CONFIGURE_ARGS+= --with-abi=elfv2 .endif -LANGUAGES:= c,c++,objc,fortran,jit +LANGUAGES= c,c++,objc,fortran +.if ${ARCH} != i386 && !empty(PORT_OPTIONS:M*BOOTSTRAP) +LANGUAGES:= ${LANGUAGES},jit +.endif + TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} TARGLIB32= ${PREFIX}/lib32 # The version information is added later LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} diff --git a/lang/gcc14/pkg-help b/lang/gcc14/pkg-help index 9030bbb28d3f..632e1c65f816 100644 --- a/lang/gcc14/pkg-help +++ b/lang/gcc14/pkg-help @@ -1,3 +1,6 @@ Building this port with LTO_BOOTSTRAP enabled requires significant amounts of memory and time. Consider disabling LTO_BOOTSTRAP in favor of STANDARD_BOOTSTRAP -(or disabling BOOTSTRAP altogether) in case that is a problem. +in case that is a problem. + +Note that disabling bootstrap altogether is possible, but not recommended: some +features (e.g. jit) requires you to choose a bootstrap option to be enabled. diff --git a/lang/gcc15-devel/Makefile b/lang/gcc15-devel/Makefile index b180557683be..76fc0fdc0a37 100644 --- a/lang/gcc15-devel/Makefile +++ b/lang/gcc15-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= gcc -PORTVERSION= 15.2.1.s20250830 +PORTVERSION= 15.2.1.s20250906 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc15-devel/distinfo b/lang/gcc15-devel/distinfo index 7e228de70fda..ea1a272beba2 100644 --- a/lang/gcc15-devel/distinfo +++ b/lang/gcc15-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756646163 -SHA256 (gcc-15-20250830.tar.xz) = ff984d2584184a57353c8ba5023c32963a4f9ee65a0d6362c04cef4854643ff9 -SIZE (gcc-15-20250830.tar.xz) = 92318400 +TIMESTAMP = 1757406561 +SHA256 (gcc-15-20250906.tar.xz) = 5975968b10e0798186b4469084d4bca037134e710cebfe48e4cc0199572d1abf +SIZE (gcc-15-20250906.tar.xz) = 92313708 diff --git a/lang/gcc15/Makefile b/lang/gcc15/Makefile index 957ccabf391e..d4e52f6d3815 100644 --- a/lang/gcc15/Makefile +++ b/lang/gcc15/Makefile @@ -80,11 +80,11 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} CONFIGURE_ARGS+= --with-abi=elfv2 .endif -.if ${ARCH} == i386 -LANGUAGES:= c,c++,objc,fortran -.else -LANGUAGES:= c,c++,objc,fortran,jit +LANGUAGES= c,c++,objc,fortran +.if ${ARCH} != i386 && !empty(PORT_OPTIONS:M*BOOTSTRAP) +LANGUAGES:= ${LANGUAGES},jit .endif + TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} TARGLIB32= ${PREFIX}/lib32 # The version information is added later LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} diff --git a/lang/gcc15/pkg-help b/lang/gcc15/pkg-help index 9030bbb28d3f..632e1c65f816 100644 --- a/lang/gcc15/pkg-help +++ b/lang/gcc15/pkg-help @@ -1,3 +1,6 @@ Building this port with LTO_BOOTSTRAP enabled requires significant amounts of memory and time. Consider disabling LTO_BOOTSTRAP in favor of STANDARD_BOOTSTRAP -(or disabling BOOTSTRAP altogether) in case that is a problem. +in case that is a problem. + +Note that disabling bootstrap altogether is possible, but not recommended: some +features (e.g. jit) requires you to choose a bootstrap option to be enabled. diff --git a/lang/gcc16-devel/Makefile b/lang/gcc16-devel/Makefile index 853b997dfaed..00af9f1c6e60 100644 --- a/lang/gcc16-devel/Makefile +++ b/lang/gcc16-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= gcc -PORTVERSION= 16.0.0.s20250831 +PORTVERSION= 16.0.0.s20250907 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc16-devel/distinfo b/lang/gcc16-devel/distinfo index 1fa7165385f0..10413d170187 100644 --- a/lang/gcc16-devel/distinfo +++ b/lang/gcc16-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756891264 -SHA256 (gcc-16-20250831.tar.xz) = 186e0e8e07870edf43b7230faa082d5c51022431462bca4db4d35fb84f3fbc6b -SIZE (gcc-16-20250831.tar.xz) = 95517600 +TIMESTAMP = 1757406881 +SHA256 (gcc-16-20250907.tar.xz) = 89654422a8b5e4bd66135f06f0ac671b465cb7ef020fa92f4d8ed17071b688ba +SIZE (gcc-16-20250907.tar.xz) = 95560696 diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 3d0c2fa874f6..c00f57552769 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -14,12 +14,8 @@ MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -NIGHTLY_DATE= 2025-08-05 -BOOTSTRAPS_DATE= 2025-06-24 +NIGHTLY_DATE= 2025-09-07 +BOOTSTRAPS_DATE= 2025-08-05 RUST_BOOTSTRAP_VERSION= beta -post-configure: - # remove after bootstraps are updated to version higher than 2025-07-27 - @${REINPLACE_CMD} -e '/ccache=/d' ${WRKSRC}/config.toml - .include "${MASTERDIR}/Makefile" diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 8dbff4c87479..e764885b3c55 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1754482083 -SHA256 (rust/2025-08-05/rustc-nightly-src.tar.xz) = 428963a5586248c0f088dff1dda048060b447c2bf187ca2326b62af47c80f9fc -SIZE (rust/2025-08-05/rustc-nightly-src.tar.xz) = 272353928 -SHA256 (rust/2025-06-24/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 71e9e3a1d1f5e8dc98403c2a6695c969908ba0cde594c4e20249fe81b67d62d1 -SIZE (rust/2025-06-24/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88377504 -SHA256 (rust/2025-06-24/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 7cc4adb3c102eac53916b28c0dad40bd095e19ea3fd0430e84a2e0b094445809 -SIZE (rust/2025-06-24/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28253396 -SHA256 (rust/2025-06-24/cargo-beta-x86_64-unknown-freebsd.tar.xz) = be762a368c6dfbe47a0f8c4b09cea1755a6d311f713b57b57a87276c88e5c34d -SIZE (rust/2025-06-24/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10790116 +TIMESTAMP = 1757341820 +SHA256 (rust/2025-09-07/rustc-nightly-src.tar.xz) = b2e82674b09400cce62f8b8b6c16c09dc0cd035f1577dc270bcc713872763943 +SIZE (rust/2025-09-07/rustc-nightly-src.tar.xz) = 284060052 +SHA256 (rust/2025-08-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = cdfe207645068b4659b0f979cae177723c5f211084f45ae9180b2d93ee83fce6 +SIZE (rust/2025-08-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 87833828 +SHA256 (rust/2025-08-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = bd48292b8582167a5e89ebe521c9754495403968c184b925df8b2ec1da344fc3 +SIZE (rust/2025-08-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 30795804 +SHA256 (rust/2025-08-05/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 11e1a51740a728f5825364a8679b28454a68e7efc96320730f9b58a8fc2e6fae +SIZE (rust/2025-08-05/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 11419484 diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs index 6d7f6d612496..8953ab44bbf2 100644 --- a/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs +++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs @@ -4,14 +4,16 @@ It otherwise wastes significant time (there are a lot of individual files) and stages host docs, wasm docs, which unstages the host docs first. ---- src/bootstrap/src/core/build_steps/install.rs.orig 2022-05-01 20:28:31 UTC +XXX: Shouldn't we instead just avoid adding docs-*-wasm* to _COMPONENTS in lang/rust/Makefile? + +--- src/bootstrap/src/core/build_steps/install.rs.orig 2025-08-24 19:46:17 UTC +++ src/bootstrap/src/core/build_steps/install.rs -@@ -138,7 +138,7 @@ macro_rules! install { +@@ -206,7 +206,7 @@ install!((self, builder, _config), } install!((self, builder, _config), -- Docs, path = "src/doc", _config.docs, only_hosts: false, { -+ Docs, path = "src/doc", _config.docs, only_hosts: true, { +- Docs, path = "src/doc", _config.docs, IS_HOST: false, { ++ Docs, path = "src/doc", _config.docs, IS_HOST: true, { let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs"); install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball); }; diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs index a556833eed1e..4b024680070c 100644 --- a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs +++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs @@ -1,14 +1,14 @@ ---- src/bootstrap/src/core/config/config.rs.orig 2025-06-08 20:17:28 UTC +--- src/bootstrap/src/core/config/config.rs.orig 2025-08-24 19:46:17 UTC +++ src/bootstrap/src/core/config/config.rs -@@ -1459,9 +1459,9 @@ impl Config { - || source_version.minor == stage0_version.minor + 1))) - { - let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1); -- fail(&format!( -+ eprintln!( - "Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}" -- )); -+ ); - } +@@ -1991,9 +1991,9 @@ pub fn check_stage0_version( + || source_version.minor == stage0_version.minor + 1))) + { + let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1); +- fail(&format!( ++ eprintln!( + "Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}" +- )); ++ ); } + } diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs new file mode 100644 index 000000000000..9504f4a16f94 --- /dev/null +++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs @@ -0,0 +1,23 @@ +XXX: cc_tool is Gnu here because of patch-vendor_cc.rs. We need to seek need better solution. + +--- src/bootstrap/src/core/sanity.rs.orig 2025-09-06 18:37:35 UTC ++++ src/bootstrap/src/core/sanity.rs +@@ -338,12 +338,12 @@ than building it. + let cc_tool = build.cc_tool(*target); + if !cc_tool.is_like_clang() && !cc_tool.path().ends_with("emcc") { + // emcc works as well +- panic!( +- "Clang is required to build C code for Wasm targets, got `{}` instead\n\ +- this is because compiler-builtins is configured to build C source. Either \ +- ensure Clang is used, or adjust this configuration.", +- cc_tool.path().display() +- ); ++ //panic!( ++ // "Clang is required to build C code for Wasm targets, got `{}` instead\n\ ++ // this is because compiler-builtins is configured to build C source. Either \ ++ // ensure Clang is used, or adjust this configuration.", ++ // cc_tool.path().display() ++ //); + } + } + diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs index 11682cd5f1f6..377f1a9346db 100644 --- a/lang/rust-nightly/files/patch-vendor_cc.rs +++ b/lang/rust-nightly/files/patch-vendor_cc.rs @@ -86,8 +86,8 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.23/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.23/src/tool.rs +--- vendor/cc-1.2.26/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.26/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -99,8 +99,8 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.26/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.26/src/tool.rs +--- vendor/cc-1.2.28/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.28/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -112,8 +112,8 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.27/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.27/src/tool.rs +--- vendor/cc-1.2.33/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.33/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -125,8 +125,8 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.31/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.31/src/tool.rs +--- vendor/cc-1.2.35/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.35/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { diff --git a/lang/rust/Makefile b/lang/rust/Makefile index f4f9f1222023..fc9fbf3582f5 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -196,11 +196,13 @@ do-configure: .if ${PORT_OPTIONS:MLTO} @${ECHO_CMD} 'thin-lto=true' >> ${WRKSRC}/config.toml .endif +.if !defined(PKGNAMESUFFIX) .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) @${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml .else @${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml .endif +.endif @${ECHO_CMD} 'ninja=true' >> ${WRKSRC}/config.toml .if ${ARCH} == powerpc # Rust doesn't call the system compiler with the full version of the target. |