From: Peter Michael Green Date: Wed, 28 Nov 2018 09:43:50 +0000 (+0000) Subject: Manual merge of version 8.2.2-4+rpi1 and 8.4.3+dfsg1-4 to produce 8.4.3+dfsg1-4+rpi1 X-Git-Tag: archive/raspbian/8.4.3+dfsg1-4+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9783a474fe01e4d62a810c3656329cc0479dbb47;p=ghc.git Manual merge of version 8.2.2-4+rpi1 and 8.4.3+dfsg1-4 to produce 8.4.3+dfsg1-4+rpi1 --- 9783a474fe01e4d62a810c3656329cc0479dbb47 diff --cc compiler/main/SysTools.hs index 9192482b,93989ad2..4fb1601b --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@@ -364,8 -294,11 +294,11 @@@ initSysTools mbMinus sPgm_T = touch_path, sPgm_windres = windres_path, sPgm_libtool = libtool_path, + sPgm_ar = ar_path, + sPgm_ranlib = ranlib_path, sPgm_lo = (lo_prog,[]), - sPgm_lc = (lc_prog,[]), + sPgm_lc = (lc_prog,[Option "-mcpu=arm1176jzf-s"]), + sPgm_lcc = (lcc_prog,[]), sPgm_i = iserv_prog, sOpt_L = [], sOpt_P = [], diff --cc debian/changelog index 9c070f8b,1c00a69c..69b89e86 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,135 +1,148 @@@ - ghc (8.2.2-4+rpi1) buster-staging; urgency=medium ++ghc (8.4.3+dfsg1-4+rpi1) buster-staging; urgency=medium + + [changes brought forward from 7.6.3-21+rpi1 by Peter Michael Green at Sun, 19 Apr 2015 14:00:16 +0000] + * Change compiler defaults for armv6 + * Force llvm cpu and float abi options + [changes introduced in 7.8.4-9+rpi1 by Peter Michael Green] + * no longer set Option "-float-abi=hard" in force-llc-settings, ghc now + sets it without help and setting it twice makes llc fail. + [changed introduced in 7.10.3-2+rpi1 by Peter Michael Green] + * Add call to dh_autoreconf_clean + - -- Raspbian forward porter Tue, 03 Jul 2018 12:25:58 +0000 ++ -- Peter Michael green Wed, 28 Nov 2018 06:00:51 +0000 ++ + ghc (8.4.3+dfsg1-4) unstable; urgency=medium + + * Add missing Breaks+Replaces+Provides (Closes: #910480). + Break+Replace+Provide all bundled libraries, including libghc-parsec3-dev. + + -- Ilias Tsitsimpis Fri, 19 Oct 2018 13:09:22 +0300 + + ghc (8.4.3+dfsg1-3) unstable; urgency=medium + + * Conflict with mtl and stm. closes: #910008. + + -- Clint Adams Thu, 18 Oct 2018 18:20:40 -0400 + + ghc (8.4.3+dfsg1-2) unstable; urgency=medium + + * Upload to unstable + + -- Ilias Tsitsimpis Wed, 26 Sep 2018 12:10:37 +0300 + + ghc (8.4.3+dfsg1-1) experimental; urgency=medium + + * Backport upstream commit 18cb44dfae3f. + This fixes upstream bug #15213 (32 bit Haddock runs out of memory + compiling 32 bit GHC). + * Remove DFSG incompatible file (Closes: #870683). + + -- Ilias Tsitsimpis Fri, 21 Sep 2018 23:05:59 +0300 + + ghc (8.4.3-7) experimental; urgency=medium + + * Backport upstream commit ec9aacf3eb2 (add -latomic to ghc-prim) + * Use system's default ld (ld.bfd) on sparc64, instead of ld.gold + (Closes: #908998) + + -- Ilias Tsitsimpis Tue, 18 Sep 2018 14:30:06 +0300 + + ghc (8.4.3-6) experimental; urgency=medium + + [ Gianfranco Costamagna ] + * Try to fix armel build + + [ John Paul Adrian Glaubitz ] + * ghc: disable ld override on powerpcspe too + + [ Ilias Tsitsimpis ] + * Allow unregisterised ghc-8.2 to build newer GHC + * Bump to Standards-Version 4.2.1 + + -- Ilias Tsitsimpis Fri, 14 Sep 2018 14:32:12 +0300 + + ghc (8.4.3-5) experimental; urgency=medium + + * Switch to dh_auto_configure, making the correct triplet + being passed to the build system, with also --target flag + (this should hopefully make the configure more robust, and + stop failing now that armhf runs on arm64 systems) + - thanks waldi, jcristay for the help + + -- Gianfranco Costamagna Fri, 20 Jul 2018 13:52:19 +0200 + + ghc (8.4.3-4) experimental; urgency=medium + + * merge with unstable 8.2.2-6 + + -- Gianfranco Costamagna Fri, 20 Jul 2018 00:24:43 +0200 + + ghc (8.4.3-3) experimental; urgency=medium + + * Switch configure.ac to search for llvm 6.0 + + -- Gianfranco Costamagna Thu, 19 Jul 2018 12:16:02 +0200 + + ghc (8.4.3-2) experimental; urgency=medium + + [ Gianfranco Costamagna ] + * Remove old and non-applied anymore powerpcspe-disable-FPU-code.patch. + (Closes: #900817) + * Switch to llvm 6.0 (Closes: #850915) + + [ Clint Adams ] + * Merge in 8.2.2-5. + + -- Clint Adams Wed, 18 Jul 2018 19:12:59 -0400 + + ghc (8.4.3-1) experimental; urgency=medium + + * New upstream version. + * Apply upstream patch to build on armhf. + + -- Clint Adams Wed, 30 May 2018 18:34:37 -0400 + + ghc (8.4.2-1) experimental; urgency=medium + + * New upstream release + + -- Gianfranco Costamagna Mon, 23 Apr 2018 10:28:43 +0200 + + ghc (8.4.1-2) experimental; urgency=medium + + * Refresh armel patch, but do not apply it, to see + if upstream changes are enough to make it build again + + -- Gianfranco Costamagna Tue, 10 Apr 2018 08:58:07 +0200 + + ghc (8.4.1-1) experimental; urgency=medium + + * New upstream release, patch refresh + * Bump std-version to 4.1.4, no changes required + * d/{rules,control}: switch to llvm 5.0 on arm* + * Drop patches included in new upstream release: + - reproducible-tmp-names + - do-not-use-SHELL + - build-unlit-and-hp2ps-twice.patch + - fix-hssplicety.patch + - lower-optimization-for-unreg.patch + + -- Gianfranco Costamagna Mon, 09 Apr 2018 15:54:00 +0200 + + ghc (8.2.2-6) unstable; urgency=medium + + * debian/patches/{risc-support,e175aaf6918bb2b497b83618dc4c270a0d231a1c}.patch + - add upstream patches to support risc* platforms (Closes: #904096) + + -- Gianfranco Costamagna Thu, 19 Jul 2018 19:24:01 +0200 + + ghc (8.2.2-5) unstable; urgency=medium + + * Apply patch to disable -Bsymbolic on unregisterised + architectures. closes: #904055. + * Add autopkgtest. + + -- Clint Adams Wed, 18 Jul 2018 18:56:46 -0400 ghc (8.2.2-4) unstable; urgency=medium diff --cc debian/patches/ARM-VFPv3D16 index 855ba690,42e67c97..ccad493a --- a/debian/patches/ARM-VFPv3D16 +++ b/debian/patches/ARM-VFPv3D16 @@@ -6,15 -6,16 +6,17 @@@ Author: Jani Monoses