diff options
| -rw-r--r-- | dev-lang/rust/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/rust/rust-1.85.1-r991.ebuild (renamed from dev-lang/rust/rust-1.85.0-r1.ebuild) | 35 | ||||
| -rw-r--r-- | www-client/chromium/Manifest | 2 | ||||
| -rw-r--r-- | www-client/chromium/chromium-137.0.7106.2.ebuild | 2 |
4 files changed, 32 insertions, 11 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index 0e0e16b..91bb57b 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -3,5 +3,7 @@ AUX 1.85.0-cross-compile-libz.patch 1130 BLAKE2B 145695a50ccf2db6f8060bf313924e4 AUX 1.85.0-musl-dynamic-linking.patch 15350 BLAKE2B 86704d0f99630153c10454d9776e8097f74e56abe69fcb71e6e9b62e8d8ee003cab981c9d2b719e4290249aece6b3b0fd547727ab89516500bfba18a8ffbb58b SHA512 31fec41ddd6c84988f22869ab7b81adc92ca5ebdce2f62ec4ddb6ed91e0bedcf3e34ddbd8a0725fa2ec50b84d0f87444c1beceaefb301f34864461ae071691f6 DIST rustc-1.85.0-src.tar.xz 274011696 BLAKE2B 9cb1c5b9fa9b0ee8a3150d634b58f4d14c38342f19cffbdcaa4e783150f9b3c516763d549d9998d90e11377cd59e9d9442a99079aafccdc005739b075574447a SHA512 3e9c933d1d9b6e5fb081837cf07eb1638b1a6b4fd1cb607dd860c5021ba7b521edbaf8ba0fa8f182f62178b72a3e1a3e6b26675e8fb6530871137852a074443c DIST rustc-1.85.0-src.tar.xz.asc 801 BLAKE2B 8168c984f69356898f7a51199f3250a51c58a6512463cd5011acdff8c63754ba196bb050dba95b73d37c7e6d4bbcd3d1cb471d067a6615cd81b8969394e3539a SHA512 b96fffde7eb3d98cca6abe44e671fd4752416357ab3180d2a09a60fc022ac03d10e64ae285ef6276b8d881d6154fd7398f46666f5a2ea6f3023ea38fd543f59e -EBUILD rust-1.85.0-r1.ebuild 25041 BLAKE2B 6c4a1a7248da0e64ade535c087f2a60d82ed52fe1c2e0a6ce11ceabb91d098015b4b921559d35ed3c343d6c36f15174f43d8de7f6388146315ac72abf418eff2 SHA512 a38e1cd9b1979d87352acf70851aebb9c32b97aef478edf9d54f679c04292ebcbb7a5ac5162899b690cc3e584d4b10a0555ff4feb8b523e87bff8a313715df75 +DIST rustc-1.85.1-src.tar.xz 274028992 BLAKE2B 1dddbbc0d14fe9551fd2eb59a47521ac7eaf783b8ebf5e89d3e82b38f3f1539c14626a86b6530a47e5a967d47a04db7a3daef568eb5164f42d98b6826346cffe SHA512 d61afb4f00d0c63eef132e10ca5369202064ecad8ab5bcf4fbd62e9a20b2bd71840b2a769dadcf43452fc0448865975c9de1c129752caa9928d2757027bacf7c +DIST rustc-1.85.1-src.tar.xz.asc 801 BLAKE2B 07409ef6c044b72394a28dfd5b5decb237ca540714010a4f81e4213a3bf7ffb2e14029789f930cea0dab115a6e986859f6cdefd3798be780c2ff21c3e5fa6593 SHA512 7f19653fd05c89390a4073f5184ca162863b7116cc4d8867a5aa4304568880707ebb9f9dda166d7d04f30b2df6ed223eedd98df1744f809773054edfcd2385ff EBUILD rust-1.85.0-r991.ebuild 25416 BLAKE2B 9f8e7c616ef4ccbe3e59b8a2d6525455f46df5694b6270c2b047f388f7294b2389d32988f46b1399df8cb780391fea0a22173ddc75079a35e8c0ee2cdf8c4fdd SHA512 4f82abd846184dc1234b8309c19183c774872cea395fb0caffa61719485ea7c424bf24725f42cda4af3558ceefec5ddb97335ad900714a8b49d1fa4a7500e45a +EBUILD rust-1.85.1-r991.ebuild 25643 BLAKE2B b99bd513b93cbe6bb323c847f6bb6ffa65148a1f8dda3cdc30dbba10ff79246ee1789e9b5559a1dd5a009a9267bbdf69786c9e11f289419cfa2ba210e3f3b3b3 SHA512 111039bca038d06d37cf0cf4d2b7d840a0b636ed8812288c6798a3479d687301a2a1660bc1ca1c4152f79ce8c5eab1da28ee5d827aaf9e9d80a91fa38e29edcb diff --git a/dev-lang/rust/rust-1.85.0-r1.ebuild b/dev-lang/rust/rust-1.85.1-r991.ebuild index 7f08951..f7014b5 100644 --- a/dev-lang/rust/rust-1.85.0-r1.ebuild +++ b/dev-lang/rust/rust-1.85.1-r991.ebuild @@ -61,12 +61,17 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} # https://github.com/rust-lang/llvm-project/blob/rustc-1.84.0/llvm/CMakeLists.txt -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa ) +_ALL_RUST_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa ) +declare -A ALL_RUST_EXPERIMENTAL_TARGETS +for _x in "${_ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do + ALL_RUST_EXPERIMENTAL_TARGETS["llvm_targets_${_x}"]=0 +done LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV%%_*}" # Beta releases get to share the same SLOT as the eventual stable -IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto nightly rustfmt rust-analyzer rust-src system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto rustfmt rust-analyzer rust-src system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE+=" nightly" if [[ ${PV} = *9999* ]]; then # These USE flags require nightly rust @@ -77,6 +82,9 @@ LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation for _x in "${ALL_LLVM_TARGETS[@]}"; do LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" ) + if [[ -v ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"] ]] ; then + ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"]=1 + fi done LLVM_DEPEND+=( " wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" ) LLVM_DEPEND+=( " $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" ) @@ -87,6 +95,7 @@ BDEPEND="${PYTHON_DEPS} >=sys-devel/gcc-4.7[cxx] >=llvm-core/clang-3.5 ) + lto? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') ) !system-llvm? ( >=dev-build/cmake-3.13.4 app-alternatives/ninja @@ -159,6 +168,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.85.0-cross-compile-libz.patch + "${FILESDIR}"/1.85.0-musl-dynamic-linking.patch "${FILESDIR}"/1.67.0-doc-wasm.patch ) @@ -298,6 +308,10 @@ src_prepare() { fi fi + if use lto && tc-is-clang && ! tc-ld-is-lld; then + export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" + fi + default } @@ -346,13 +360,13 @@ src_configure() { rust_build="$(rust_abi "${CBUILD}")" rust_host="$(rust_abi "${CHOST}")" - LLVM_EXPERIMENTAL_TARGETS=() - for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do - if use llvm_targets_${_x} ; then - LLVM_EXPERIMENTAL_TARGETS+=( ${_x} ) + RUST_EXPERIMENTAL_TARGETS=() + for _x in "${!ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do + if [[ ${ALL_RUST_EXPERIMENTAL_TARGETS[${_x}]} == 1 ]] && use ${_x} ; then + RUST_EXPERIMENTAL_TARGETS+=( ${_x#llvm_targets_} ) fi done - LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]} + RUST_EXPERIMENTAL_TARGETS=${RUST_EXPERIMENTAL_TARGETS[@]} local cm_btype="$(usex debug DEBUG RELEASE)" local build_channel @@ -379,7 +393,7 @@ src_configure() { assertions = $(toml_usex debug) ninja = true targets = "${LLVM_TARGETS// /;}" - experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}" + experimental-targets = "${RUST_EXPERIMENTAL_TARGETS// /;}" link-shared = $(toml_usex system-llvm) $(if is_libcxx_linked; then # https://bugs.gentoo.org/732632 @@ -455,7 +469,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) channel = "${build_channel}" description = "gentoo" @@ -466,6 +480,9 @@ src_configure() { dist-src = false remap-debuginfo = true lld = $(usex system-llvm false $(toml_usex wasm)) + $(if use lto && tc-is-clang ; then + echo "use-lld = true" + fi) # only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it # https://github.com/rust-lang/rust/issues/74976 # https://github.com/rust-lang/rust/issues/76526 diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index d7026ef..8a5a010 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -41,4 +41,4 @@ DIST chromium-136.0.7064.0.tar.xz 7136955564 BLAKE2B c36bc6d7455b5f0315b9c104523 DIST chromium-137.0.7106.2.tar.xz 7083460752 BLAKE2B 9b952e86bfa2bd3cc70b6b104d922cf85db446366ff1fa09d64d95686c744d0aeaaba1d1939795b10a9fef6ca137aab0281fb25c76b974426140974f2a4cd5b7 SHA512 5c2b6b64f1504c07eb275928784c2975550967bf634042652ff941e20a35dbb97a6b3e57e37d0b2b5f251e5015011abfcf13e69005ea82025a425452124a1f64 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c EBUILD chromium-136.0.7064.0.ebuild 40494 BLAKE2B 7d05d97072bdacdf287ae4cf48308a6c7dc2870b67737700473863eb6ede3f48bec88ff6cb33a54b0a15fa34745a99ccb4c88ffd656f7f284ae3fa6c47565ba0 SHA512 5450bde108fb0df9c6b9f1cac109f4fdceda0c0ed51bf8b3b5f1ac6db584c189d4ee3152999025746187f305ee48e26c1c7ce1b6b9d52f9f8b3c239d55a7b51e -EBUILD chromium-137.0.7106.2.ebuild 40448 BLAKE2B 01fa976938b65ba6bbe01d15bb62a7263e8755a3daec9cacebd56db850a6643b6303da90f3cbd5ea992079d801982e91471f719eac3e69437f2bb97cdef25cf9 SHA512 b62df1d436e6542cdafc63b7a127c328ad73393b39f194dfb09107b36c847bbddde0c0cb94c99bc76489a577896c4a12dd3745f416a3c5ec689625d569a4e269 +EBUILD chromium-137.0.7106.2.ebuild 40550 BLAKE2B 5e1ae7f847e457c1796ee21d0bd03e65e775bde8747b59ab224651d315221913a1631325a22ebde7af3f768a1781595bca6ea0449d0afbbe6c7d452f2608cd86 SHA512 aa9e9b276069e298fbe5049d098527465ec9ab0989717cb942a07f0c88002ec4ac0dc0d3584a28d383ab0541d965f7567e1efea4a441f6422cc28a8d7c9f376b diff --git a/www-client/chromium/chromium-137.0.7106.2.ebuild b/www-client/chromium/chromium-137.0.7106.2.ebuild index c0bb8bd..dc54630 100644 --- a/www-client/chromium/chromium-137.0.7106.2.ebuild +++ b/www-client/chromium/chromium-137.0.7106.2.ebuild @@ -428,6 +428,7 @@ src_prepare() { third_party/devtools-frontend/src/front_end/third_party/i18n third_party/devtools-frontend/src/front_end/third_party/intl-messageformat third_party/devtools-frontend/src/front_end/third_party/json5 + third_party/devtools-frontend/src/front_end/third_party/legacy-javascript third_party/devtools-frontend/src/front_end/third_party/lighthouse third_party/devtools-frontend/src/front_end/third_party/lit third_party/devtools-frontend/src/front_end/third_party/marked @@ -461,6 +462,7 @@ src_prepare() { third_party/google_input_tools/third_party/closure_library third_party/google_input_tools/third_party/closure_library/third_party/closure third_party/googletest + third_party/harfbuzz-ng third_party/hunspell third_party/ink third_party/inspector_protocol |