From 4b4a016cd02f9e623d60072a86856a4c42a534ea Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 16 Jul 2018 13:09:11 +0200 Subject: [PATCH] Update to 1.11.0 beta2 --- .gitignore | 1 + ...y-on-non-x86-archs-with-64-bit-reals.patch | 35 ------------------- ...ine-upstream-regression-in-v-predefs.patch | 26 -------------- ldc.spec | 11 +++--- sources | 2 +- 5 files changed, 7 insertions(+), 68 deletions(-) delete mode 100644 0001-Fix-compilability-on-non-x86-archs-with-64-bit-reals.patch delete mode 100644 0002-Fix-missing-newline-upstream-regression-in-v-predefs.patch diff --git a/.gitignore b/.gitignore index 0998de3..7c53759 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /ldc-1.10.0-src.tar.gz /ldc-0.17.6-gita1a8a84-src.tar.gz /ldc-1.11.0-beta1-src.tar.gz +/ldc-1.11.0-beta2-src.tar.gz diff --git a/0001-Fix-compilability-on-non-x86-archs-with-64-bit-reals.patch b/0001-Fix-compilability-on-non-x86-archs-with-64-bit-reals.patch deleted file mode 100644 index 316d7ef..0000000 --- a/0001-Fix-compilability-on-non-x86-archs-with-64-bit-reals.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 036e3d63037e7f8d9403526501ba95b741babc6f Mon Sep 17 00:00:00 2001 -From: Martin Kinkelin -Date: Thu, 5 Jul 2018 22:02:01 +0200 -Subject: [PATCH 1/2] Fix compilability on non-x86 archs with 64-bit reals - ---- - dmd/root/longdouble.d | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/dmd/root/longdouble.d b/dmd/root/longdouble.d -index ba6cff0..c1cbc2b 100644 ---- a/dmd/root/longdouble.d -+++ b/dmd/root/longdouble.d -@@ -10,10 +10,15 @@ - - module dmd.root.longdouble; - --static if (real.sizeof > 8) -- alias longdouble = real; -+version(CRuntime_Microsoft) -+{ -+ static if (real.sizeof > 8) -+ alias longdouble = real; -+ else -+ alias longdouble = longdouble_soft; -+} - else -- alias longdouble = longdouble_soft; -+ alias longdouble = real; - - // longdouble_soft needed when building the backend with - // Visual C or the frontend with LDC on Windows --- -2.17.1 - diff --git a/0002-Fix-missing-newline-upstream-regression-in-v-predefs.patch b/0002-Fix-missing-newline-upstream-regression-in-v-predefs.patch deleted file mode 100644 index d8bc11e..0000000 --- a/0002-Fix-missing-newline-upstream-regression-in-v-predefs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9f5c3897e6657b8cb8bfc04b1bd55f1ec5d7446e Mon Sep 17 00:00:00 2001 -From: Martin Kinkelin -Date: Thu, 5 Jul 2018 22:04:18 +0200 -Subject: [PATCH 2/2] Fix missing newline (upstream) regression in -v predefs - output - ---- - dmd/mars.d | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dmd/mars.d b/dmd/mars.d -index 031782b..8056c04 100644 ---- a/dmd/mars.d -+++ b/dmd/mars.d -@@ -1627,7 +1627,7 @@ private void printPredefinedVersions(FILE* stream) - buf.writeByte(' '); - buf.writestring(str.toChars()); - } -- stream.fprintf("predefs %s", buf.peekString()); -+ stream.fprintf("predefs %s\n", buf.peekString()); - } - } - --- -2.17.1 - diff --git a/ldc.spec b/ldc.spec index 8e2b123..cbc122d 100644 --- a/ldc.spec +++ b/ldc.spec @@ -3,7 +3,7 @@ %global dmdfe_bump 81 %global dmdfe %dmdfe_major.%dmdfe_minor.%dmdfe_bump -%global pre beta1 +%global pre beta2 %global llvm_version %{nil} @@ -17,7 +17,7 @@ Name: ldc Epoch: 1 Version: 1.11.0 -Release: 0.2%{?pre:.%{pre}}%{?dist} +Release: 0.3%{?pre:.%{pre}}%{?dist} Summary: A compiler for the D programming language # The DMD frontend in dmd/* GPL version 1 or artistic license @@ -34,10 +34,6 @@ Source1: ldc-0.17.6-gita1a8a84-src.tar.gz %endif Source3: macros.%{name} -# Backported from upstream -Patch0: 0001-Fix-compilability-on-non-x86-archs-with-64-bit-reals.patch -Patch1: 0002-Fix-missing-newline-upstream-regression-in-v-predefs.patch - ExclusiveArch: %{ldc_arches} %if ! 0%{?bootstrap} @@ -279,6 +275,9 @@ install -m0644 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/ %{_datadir}/geany/tags/phobos.d.tags %changelog +* Mon Jul 16 2018 Kalev Lember - 1:1.11.0-0.3.beta2 +- Update to 1.11.0 beta2 + * Fri Jul 13 2018 Fedora Release Engineering - 1:1.11.0-0.2.beta1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index b84913c..aa73cb9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ldc-0.17.6-gita1a8a84-src.tar.gz) = 6a0c42e152de3362acea4ba6e2b8eea64ffb36b96c70edbbe7d7f5b01bdca3561f19410c14211117263d8ebd6bd43621f25032327f5d6b0f135d37266c60101c -SHA512 (ldc-1.11.0-beta1-src.tar.gz) = aa187a5e9647e1256a473363d84286fac6fb5a59763735a45653d8d265326f2207dac104d625cb27eb5dab27253c778a4ceb721c37ab2d95c597b6efb4de8ff4 +SHA512 (ldc-1.11.0-beta2-src.tar.gz) = e2cf45687923abde1fb6bb6a27e47bead1bebcba71017ef1a5af61171b40209e63db2180b699d40f066a7ea0864a09f05187b8f217133a557bb1f16618b4fc6e