Accepting request 1284764 from devel:languages:rust

forward package

OBS-URL: https://build.opensuse.org/request/show/1284764
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rust1.87?expand=0&rev=3

rust1.87.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jun 11 04:52:47 UTC 2025 - William Brown <william.brown@suse.com>
+
+- Add wasm32-unknown-unknown support
+
+-------------------------------------------------------------------
+Wed Jun 11 03:34:45 UTC 2025 - William Brown <william.brown@suse.com>
+
+- Support SLE12 for Firefox LTS
+
+-------------------------------------------------------------------
+Wed Jun  4 20:21:37 UTC 2025 - Martin Jambor <mjambor@suse.com>
+
+- Add rust-build-onig_sys-as-C17.patch so that the package can be
+  built with GCC 15. [boo#1241943]
+
 -------------------------------------------------------------------
 Fri May 16 02:42:41 UTC 2025 - Xiaoguang Wang <xiaoguang.wang@suse.com>
 

rust1.87.spec

@@ -30,6 +30,13 @@
 %global need_gcc_version 13
 %endif
 
+# Use correct python-version for SLE-12
+%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
+%define python python3.9
+%else
+%define python python3
+%endif
+
 #KEEP NOSOURCE DEBUGINFO
 
 %define obsolete_rust_versioned() \
@@ -101,7 +108,7 @@ Obsoletes:      %{1}1.62%{?2:-%{2}}
 %global rust_triple %{rust_arch}-unknown-linux-%{abi}
 
 # Web Assembly targets
-%define rust_wasm_targets %{?with_wasi:,wasm32-wasip1}
+%define rust_wasm_targets %{?with_wasi:,wasm32-wasip1,wasm32-unknown-unknown}
 
 # Base Rust targets for all architectures
 %define rust_base_targets %{rust_triple}%{rust_wasm_targets}
@@ -287,6 +294,9 @@ Patch0:         ignore-Wstring-conversion.patch
 Patch3:         0001-Disable-pidfs-tests-for-15SP3.patch
 %endif
 
+# PATCH-FIX-OPENSUSE boo#1241943 - obsoleted by upstream github.com/rust-lang/rust/pull/141684
+Patch4:         rust-build-onig_sys-as-C17.patch
+
 BuildRequires:  chrpath
 BuildRequires:  curl
 # BUG - fdupes on leap/sle causes issues with debug info
@@ -295,7 +305,11 @@ BuildRequires:  fdupes
 %endif
 BuildRequires:  pkgconfig
 BuildRequires:  procps
+%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
+BuildRequires:  python39-base
+%else
 BuildRequires:  python3-base
+%endif
 BuildRequires:  util-linux
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(openssl)
@@ -469,7 +483,7 @@ rm -rf src/tools/clang
 rm -rf src/tools/lldb
 
 # Fix rpmlint error "This script uses 'env' as an interpreter"
-sed -i '1s|#!%{_bindir}/env python|#!%{_bindir}/python3|' library/core/src/unicode/printable.py
+sed -i '1s|#!%{_bindir}/env python|#!%{_bindir}/%{python}|' library/core/src/unicode/printable.py
 chmod +x library/core/src/unicode/printable.py
 
 %if %{with wasi}
@@ -591,7 +605,7 @@ RUSTC_LOG=rustc_codegen_ssa::back::link=info %{rust_root}/bin/rustc -C link-args
 # the same version (they did previous ver)
 
 %if %{without test}
-python3 ./x.py build
+%{python} ./x.py build
 # Debug for post build
 free -h
 df -h
@@ -602,7 +616,7 @@ df -h
 %if %{without test}
 . ./.env.sh
 
-python3 ./x.py install
+%{python} ./x.py install
 
 # bsc#1199126 - rust-lld contains an rpath, which is invalid.
 chrpath -d %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-lld
@@ -677,7 +691,7 @@ ln -s %{rust_root} %{_builddir}/rustc-%{version}-src/build/%{rust_triple}/stage0
 # Exclude mte-ffi as aarch64-linux-gnu-gcc isn't available
 
 %ifarch aarch64
-python3 ./x.py test --target=%{rust_triple} \
+%{python} ./x.py test --target=%{rust_triple} \
     --exclude tests/run-make/issue-71519 \
     --exclude tests/run-make/pgo-branch-weights \
     --exclude src/tools/tidy \
@@ -692,7 +706,7 @@ python3 ./x.py test --target=%{rust_triple} \
     --exclude tests/run-make/linker-warning \
     --exclude src/bootstrap
 %else
-python3 ./x.py test --target=%{rust_triple} \
+%{python} ./x.py test --target=%{rust_triple} \
     --exclude tests/run-make/issue-71519 \
     --exclude tests/run-make/pgo-branch-weights \
     --exclude src/tools/tidy \
@@ -750,6 +764,9 @@ python3 ./x.py test --target=%{rust_triple} \
 %{rustlibdir}/wasm32-wasip1/lib/*.rlib
 %{rustlibdir}/wasm32-wasip1/lib/self-contained/*.o
 %{rustlibdir}/wasm32-wasip1/lib/self-contained/*.a
+%dir %{rustlibdir}/wasm32-unknown-unknown
+%dir %{rustlibdir}/wasm32-unknown-unknown/lib
+%{rustlibdir}/wasm32-unknown-unknown/lib/*.rlib
 %endif
 %ifarch x86_64
 %dir %{rustlibdir}/x86_64-unknown-none