Accepting request 1061193 from home:Guillaume_G:branches:devel:languages:javascript

- Switch from deprecated rust-packaging to cargo-packaging
- Disable LTO to build with half of the RAM (fixes build on aarch64):
  * deno-disbale-lto.patch
- Update _constraints with current values

OBS-URL: https://build.opensuse.org/request/show/1061193
OBS-URL: https://build.opensuse.org/package/show/devel:languages:javascript/deno?expand=0&rev=91
This commit is contained in:
Avindra Goolcharan 2023-01-28 23:28:31 +00:00 committed by Git OBS Bridge
parent 4167192566
commit b455d98abd
6 changed files with 44 additions and 30 deletions

View File

@ -6,33 +6,10 @@
<constraints> <constraints>
<hardware> <hardware>
<disk> <disk>
<size unit="G">4</size> <size unit="G">18</size>
</disk> </disk>
<physicalmemory> <physicalmemory>
<size unit="G">11</size> <size unit="G">12</size>
</physicalmemory> </physicalmemory>
<memoryperjob>
<size unit="G">1</size>
</memoryperjob>
</hardware> </hardware>
<overwrite>
<conditions>
<arch>aarch64</arch>
</conditions>
<hardware>
<physicalmemory>
<size unit="G">15</size>
</physicalmemory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>x86_64</arch>
</conditions>
<hardware>
<disk>
<size unit="G">25</size>
</disk>
</hardware>
</overwrite>
</constraints> </constraints>

View File

@ -139,5 +139,8 @@
<param name="file">*.tar</param> <param name="file">*.tar</param>
<param name="compression">xz</param> <param name="compression">xz</param>
</service> </service>
<service name="cargo_audit" mode="disabled">
<param name="srcdir">deno</param>
</service>
</services> </services>

5
cargo_config Normal file
View File

@ -0,0 +1,5 @@
[source.crates-io]
replace-with = "vendored-sources"
[source.vendored-sources]
directory = "vendor"

17
deno-disbale-lto.patch Normal file
View File

@ -0,0 +1,17 @@
--- deno-1.26.2/Cargo.toml.orig 2023-01-26 10:13:11.259679321 +0100
+++ deno-1.26.2/Cargo.toml 2023-01-26 10:13:28.467861544 +0100
@@ -37,14 +37,12 @@ exclude = ["test_util/std/hash/_wasm"]
[profile.release]
codegen-units = 1
incremental = true
-lto = true
opt-level = 'z' # Optimize for size
# NB: the `bench` and `release` profiles must remain EXACTLY the same.
[profile.bench]
codegen-units = 1
incremental = true
-lto = true
opt-level = 'z' # Optimize for size
# Key generation is too slow on `debug`

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jan 26 10:52:37 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Switch from deprecated rust-packaging to cargo-packaging
- Disable LTO to build with half of the RAM (fixes build on aarch64):
* deno-disbale-lto.patch
- Update _constraints with current values
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 17 20:29:27 UTC 2022 - Avindra Goolcharan <avindra@opensuse.org> Mon Oct 17 20:29:27 UTC 2022 - Avindra Goolcharan <avindra@opensuse.org>

View File

@ -1,7 +1,7 @@
# #
# spec file for package deno # spec file for package deno
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# Copyright (c) 2020-2022 Avindra Goolcharan <avindra@opensuse.org> # Copyright (c) 2020-2022 Avindra Goolcharan <avindra@opensuse.org>
# Copyright (c) 2018-2022 the Deno authors # Copyright (c) 2018-2022 the Deno authors
# #
@ -27,9 +27,13 @@ Group: Productivity/Other
URL: https://github.com/denoland/deno URL: https://github.com/denoland/deno
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source1: vendor.tar.xz Source1: vendor.tar.xz
Source2: cargo_config
Source99: revendor_source.sh Source99: revendor_source.sh
# PATCH-FIX-OPENSUSE - Disable LTO
Patch1: deno-disbale-lto.patch
# gcc-c++ needed to build SPIRV-Cross # gcc-c++ needed to build SPIRV-Cross
BuildRequires: clang BuildRequires: clang
BuildRequires: cargo-packaging
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gn BuildRequires: gn
BuildRequires: lld BuildRequires: lld
@ -37,8 +41,7 @@ BuildRequires: llvm
BuildRequires: ninja BuildRequires: ninja
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-base BuildRequires: python3-base
BuildRequires: rust >= 1.53.0 BuildRequires: rust >= 1.62.1
BuildRequires: rust-packaging
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-2.0)
@ -58,8 +61,9 @@ updated with the --reload flag.
%prep %prep
%autosetup -a1 -p1 %autosetup -a1 -p1
%define cargo_registry $(pwd)/vendor cp %{SOURCE2} .cargo/config
%{cargo_prep} # Drop lock file due to revendor_source.sh breaking check
rm Cargo.lock
%build %build
# workaround to use python3 # workaround to use python3