SHA256
1
0
forked from pool/rust1.78

Accepting request 1174942 from home:firstyear:branches:devel:languages:rust

- Update incorrect tumbleweed version check.

OBS-URL: https://build.opensuse.org/request/show/1174942
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust1.78?expand=0&rev=3
This commit is contained in:
William Brown 2024-05-18 05:14:25 +00:00 committed by Git OBS Bridge
parent f61d363afc
commit d0441190cd
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 17 22:53:49 UTC 2024 - William Brown <william.brown@suse.com>
- Update incorrect tumbleweed version check.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 14 04:09:40 UTC 2024 - William Brown <william.brown@suse.com> Tue May 14 04:09:40 UTC 2024 - William Brown <william.brown@suse.com>

View File

@ -23,7 +23,7 @@
# This has to be kept lock step to the rust version. # This has to be kept lock step to the rust version.
# -- will be 18 for 1.78 # -- will be 18 for 1.78
%global llvm_version 18 %global llvm_version 18
%if 0%{?sle_version} <= 150500 && 0%{?suse_version} < 1599 %if 0%{?sle_version} <= 150900 && 0%{?suse_version} < 1599
# We may need a minimum gcc version for some linker flags # We may need a minimum gcc version for some linker flags
# This is especially true on leap/sle # This is especially true on leap/sle
# #
@ -134,7 +134,7 @@ Obsoletes: %{1}1.62%{?2:-%{2}}
# ⚠️ SLE/LEAP 15.3 LLVM is too old! # ⚠️ SLE/LEAP 15.3 LLVM is too old!
# ⚠️ 1.59 breaks codegen with distro llvm!!! # ⚠️ 1.59 breaks codegen with distro llvm!!!
%if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1550 %if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1699
# && "{version_suffix}" != "1.61" # && "{version_suffix}" != "1.61"
# Can proceed with pinned llvm. # Can proceed with pinned llvm.
%bcond_with bundled_llvm %bcond_with bundled_llvm
@ -164,7 +164,7 @@ Obsoletes: %{1}1.62%{?2:-%{2}}
%endif %endif
# === Enable wasm/wasi on t1 targets === # === Enable wasm/wasi on t1 targets ===
%if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1550 %if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1699
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
%bcond_without wasm32 %bcond_without wasm32
%bcond_without wasi %bcond_without wasi
@ -285,7 +285,7 @@ Patch0: ignore-Wstring-conversion.patch
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: curl BuildRequires: curl
# BUG - fdupes on leap/sle causes issues with debug info # BUG - fdupes on leap/sle causes issues with debug info
%if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1550 %if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1699
BuildRequires: fdupes BuildRequires: fdupes
%endif %endif
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -649,7 +649,7 @@ if [ ! -f %{buildroot}%{_libexecdir}/cargo-credential-1password ] &&
fi fi
# Silence any duplicate library warnings. # Silence any duplicate library warnings.
%if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1550 %if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1699
%fdupes %{buildroot}/%{common_libdir} %fdupes %{buildroot}/%{common_libdir}
%endif %endif