From 311a9c954d0870ec92b5d6e808e99198cf0f11f9 Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Tue, 2 Oct 2018 14:28:58 +0200
Subject: [PATCH] added build-triplet-failure.patch for configure failure with
 latest rust

---
 build-triplet-failure.patch | 18 ++++++++++++++++++
 thunderbird.spec            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 build-triplet-failure.patch

diff --git a/build-triplet-failure.patch b/build-triplet-failure.patch
new file mode 100644
index 0000000..068d27c
--- /dev/null
+++ b/build-triplet-failure.patch
@@ -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
diff --git a/thunderbird.spec b/thunderbird.spec
index 0c400df..5795a5e 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -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