Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package mozjs140 for openSUSE:Factory 
checked in at 2026-08-27 18:50:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozjs140 (Old)
 and      /work/SRC/openSUSE:Factory/.mozjs140.new.1265 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mozjs140"

Thu Aug 27 18:50:36 2026 rev:17 rq:1374078 version:140.14.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/mozjs140/mozjs140.changes        2026-08-22 
21:35:12.847209220 +0200
+++ /work/SRC/openSUSE:Factory/.mozjs140.new.1265/mozjs140.changes      
2026-08-27 18:53:06.345178233 +0200
@@ -1,0 +2,14 @@
+Thu Aug 27 12:38:38 UTC 2026 - Dominique Leuenberger <[email protected]>
+
+- Update mozjs140-rust1.98.patch: Base the patch on upstream
+  commited solution from commit 1ecaa12: andle the *-oe-linux-*
+  rust targets added in rustc 1.98 in rust target detection.
+
+-------------------------------------------------------------------
+Wed Aug 26 09:44:06 UTC 2026 - Dominique Leuenberger <[email protected]>
+
+- Add mozjs140-rust1.98.patch: Fix detection of rust target when
+  building against Rust 1.98 (build system gets confused by the new
+  target x86_64-oe-linux-gnu).
+
+-------------------------------------------------------------------

New:
----
  mozjs140-rust1.98.patch

----------(New B)----------
  New:
- Update mozjs140-rust1.98.patch: Base the patch on upstream
  commited solution from commit 1ecaa12: andle the *-oe-linux-*
----------(New E)----------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mozjs140.spec ++++++
--- /var/tmp/diff_new_pack.fAQDU4/_old  2026-08-27 18:53:12.922407398 +0200
+++ /var/tmp/diff_new_pack.fAQDU4/_new  2026-08-27 18:53:12.927407573 +0200
@@ -64,6 +64,8 @@
 # PATCH-FIX-UPSTREAM
 Patch04:        mozjs140-XP_UNIX.patch
 # PATCH-FIX-OPENSUSE
+Patch05:        mozjs140-rust1.98.patch
+# PATCH-FIX-OPENSUSE
 Patch09:        icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
 # PATCH-FIX-OPENSUSE
 Patch10:        icu_sources_data-Write-command-output-to-our-stderr.patch
@@ -159,6 +161,7 @@
 %patch -P 02 -p1
 %patch -P 03 -p1
 %patch -P 04 -p1
+%patch -P 05 -p1
 %patch -P 09 -p1
 %patch -P 10 -p1
 %patch -P 12 -p1

++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.fAQDU4/_old  2026-08-27 18:53:12.985409594 +0200
+++ /var/tmp/diff_new_pack.fAQDU4/_new  2026-08-27 18:53:12.988409698 +0200
@@ -1,6 +1,6 @@
-mtime: 1787223864
-commit: 30a3943466d9853a2099330e7ebca4bcef8ef040e30c6427483821a34fdcff52
+mtime: 1787835978
+commit: 6950f6d42d8d5122e1744e1b15ca32e3be1e6f8dc71b3ffc5468f3b2053fe96d
 url: https://src.opensuse.org/GNOME/mozjs140
-revision: 30a3943466d9853a2099330e7ebca4bcef8ef040e30c6427483821a34fdcff52
+revision: 6950f6d42d8d5122e1744e1b15ca32e3be1e6f8dc71b3ffc5468f3b2053fe96d
 projectscmsync: https://src.opensuse.org/GNOME/_ObsPrj
 

++++++ build.specials.obscpio ++++++

++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore      1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore      2026-08-27 15:06:18.000000000 +0200
@@ -0,0 +1,4 @@
+*.obscpio
+*.osc
+_build.*
+.pbuild


++++++ mozjs140-rust1.98.patch ++++++
>From 1ecaa12836a69896dd6702fb5ed5e13979399371 Mon Sep 17 00:00:00 2001
From: Jesse Schwartzentruber <[email protected]>
Date: Tue, 28 Jul 2026 17:26:38 +0000
Subject: [PATCH] Bug 2053518 - Handle the *-oe-linux-* rust targets added in
 rustc 1.98 in rust target detection.
 r=firefox-build-system-reviewers,glandium

Differential Revision: https://phabricator.services.mozilla.com/D311145
---
 build/moz.configure/rust.configure            | 29 ++++++++++++++++---
 .../configure/test_toolchain_configure.py     | 15 ++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

Index: firefox-140.14.0/build/moz.configure/rust.configure
===================================================================
--- firefox-140.14.0.orig/build/moz.configure/rust.configure
+++ firefox-140.14.0/build/moz.configure/rust.configure
@@ -302,6 +302,10 @@ def detect_rustc_target(
         elif not candidates:
             return None
 
+        # config.guess uses the "pc" vendor for x86/x86_64 where rust uses its
+        # generic "unknown" vendor; normalize so we correlate on the right one.
+        vendor = "unknown" if host_or_target.vendor == "suse" else 
host_or_target.vendor
+
         # We have multiple candidates. There are two cases where we can try to
         # narrow further down using extra information from the build system.
         # - For windows targets, correlate with the C compiler type
@@ -369,11 +373,19 @@ def detect_rustc_target(
             else:
                 suffix = ""
             for p in prefixes:
-                for c in candidates:
-                    if c.rust_target.startswith(
-                        "{}-".format(p)
-                    ) and c.rust_target.endswith(suffix):
+                matches = [
+                    c
+                    for c in candidates
+                    if c.rust_target.startswith("{}-".format(p))
+                    and c.rust_target.endswith(suffix)
+                ]
+                if not matches:
+                    continue
+                # As below, correlate on the (normalized) vendor.
+                for c in matches:
+                    if c.target.vendor == vendor:
                         return c.rust_target
+                return matches[0].rust_target
 
         # See if we can narrow down on the exact alias.
         # We use the sub_configure_alias to keep support mingw32 triplets as 
input.
@@ -402,6 +414,15 @@ def detect_rustc_target(
             elif narrowed:
                 candidates = narrowed
 
+        # Correlate on the (normalized) vendor, so vendor-specific targets 
(e.g.
+        # the *-oe-linux-gnu targets added in rust 1.98) don't shadow the
+        # generic ones for aliases whose vendor doesn't match a rust target.
+        narrowed = [c for c in candidates if c.target.vendor == vendor]
+        if len(narrowed) == 1:
+            return narrowed[0].rust_target
+        elif narrowed:
+            candidates = narrowed
+
         # See if we can narrow down with the raw OS and raw CPU
         narrowed = [
             c

Reply via email to