rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

added build-triplet-failure.patch for configure failure with latest rust

Browse Source
This commit is contained in:
Jan Horak 2018-10-02 14:28:58 +02:00
parent 901572971a
commit 311a9c954d
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build-triplet-failure.patch Normal file
View File

@ -0,0 +1,18 @@
diff -up thunderbird-60.0/build/moz.configure/init.configure.triplet-failure thunderbird-60.0/build/moz.configure/init.configure
--- thunderbird-60.0/build/moz.configure/init.configure.triplet-failure 2018-10-02 14:13:04.276835572 +0200
+++ thunderbird-60.0/build/moz.configure/init.configure 2018-10-02 14:13:18.921865210 +0200
@@ -577,7 +577,13 @@ def split_triplet(triplet, allow_unknown
# There is also a quartet form:
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
- cpu, manufacturer, os = triplet.split('-', 2)
+ parts = triplet.split('-', 2)
+ if len(parts) == 3:
+ cpu, _, os = parts
+ elif len(parts) == 2:
+ cpu, os = parts
+ else:
+ die("Unexpected triplet string: %s" % triplet)
# Autoconf uses config.sub to validate and canonicalize those triplets,
# but the granularity of its results has never been satisfying to our

2
thunderbird.spec
View File

@ -125,6 +125,7 @@ Patch304: mozilla-1245783.patch
Patch305: build-big-endian.patch
Patch306: mozilla-1353817.patch
Patch307: build-disable-elfhack.patch
Patch308: build-triplet-failure.patch
# Fedora specific patches
@ -235,6 +236,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%patch104 -p1 -b .gcc6
%patch304 -p1 -b .1245783
%patch308 -p1 -b .triplet-failure
# Patch for big endian platforms only
%if 0%{?big_endian}
%patch26 -p1 -b .icu