From b6b5bf299f77f0b15843be380944c31cdfdfd1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Thu, 19 Jun 2025 15:17:38 -0600 Subject: [PATCH] rustc-1.82: manually backported rustc-1.82 for latest abrowser builds --- ...000-edit_rules_job_numbers_for_amd64.patch | 18 +++++++++++ ...set_pkg-config_manual_path_for_aramo.patch | 12 +++++++ helpers/make-rustc-1.82 | 32 +++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 helpers/DATA/rustc-1.82/patch_changes/000-edit_rules_job_numbers_for_amd64.patch create mode 100644 helpers/DATA/rustc-1.82/patch_changes/001-set_pkg-config_manual_path_for_aramo.patch create mode 100644 helpers/make-rustc-1.82 diff --git a/helpers/DATA/rustc-1.82/patch_changes/000-edit_rules_job_numbers_for_amd64.patch b/helpers/DATA/rustc-1.82/patch_changes/000-edit_rules_job_numbers_for_amd64.patch new file mode 100644 index 0000000..5f55fc3 --- /dev/null +++ b/helpers/DATA/rustc-1.82/patch_changes/000-edit_rules_job_numbers_for_amd64.patch @@ -0,0 +1,18 @@ +diff --git a/debian/rules b/debian/rules +index 5651361f..26738cfd 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -70,9 +70,13 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + ifeq ($(DEB_HOST_ARCH),riscv64) + NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + else ++ifeq ($(DEB_HOST_ARCH),amd64) ++NJOBS := -j 8 ++else + NJOBS := -j 4 + endif + endif ++endif + RUSTBUILD = RUST_BACKTRACE=1 python3 src/bootstrap/bootstrap.py $(NJOBS) + RUSTBUILD_FLAGS = --stage 2 --config debian/config.toml --on-fail env + # rust-tidy depends on lots of modules that we strip out of the build. diff --git a/helpers/DATA/rustc-1.82/patch_changes/001-set_pkg-config_manual_path_for_aramo.patch b/helpers/DATA/rustc-1.82/patch_changes/001-set_pkg-config_manual_path_for_aramo.patch new file mode 100644 index 0000000..2a93689 --- /dev/null +++ b/helpers/DATA/rustc-1.82/patch_changes/001-set_pkg-config_manual_path_for_aramo.patch @@ -0,0 +1,12 @@ +diff --git a/debian/rules b/debian/rules +index 5651361f..2cc90e7b 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -4,6 +4,7 @@ + # The build regressed back when LTO was systematized in Ubuntu. + # This should be periodically revisited. + export DEB_BUILD_MAINT_OPTIONS=optimize=-lto ++export PKG_CONFIG=/usr/bin/pkg-config + + include /usr/share/dpkg/pkg-info.mk + include /usr/share/dpkg/vendor.mk diff --git a/helpers/make-rustc-1.82 b/helpers/make-rustc-1.82 new file mode 100644 index 0000000..a768f04 --- /dev/null +++ b/helpers/make-rustc-1.82 @@ -0,0 +1,32 @@ +#!/bin/bash +# +# Copyright (C) 2025 Luis Guzman +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=0 +EXTERNAL='deb-src https://ppa.launchpadcontent.net/liushuyu-011/rust-updates-1.82/ubuntu noble main' +REPOKEY=327405FE663500EF +BACKPORTS=true +BUILD_UNTIL=11.0 + +. ./config + +apply_patch_changes + +changelog "Adding package as a dependency for newer abrowser releases." + +package