[Git][haskell-team/DHG_packages][experimental] ghc: drop patches 11f8eef5a9625c77f78a829406c446b615ed6168 and...

[Gianfranco Costamagna (@locutusofborg)]

Gianfranco Costamagna pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
b71043bd by Gianfranco Costamagna at 2021-08-26T08:40:07+02:00
ghc: drop patches 11f8eef5a9625c77f78a829406c446b615ed6168 and 3c12355ece0fa14e534c71a9f7327eda9773fad9
now part of upstream codebase

- - - - -


3 changed files:

- − p/ghc/debian/patches/11f8eef5a9625c77f78a829406c446b615ed6168.patch
- − p/ghc/debian/patches/3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
- p/ghc/debian/patches/series


Changes:

=====================================
p/ghc/debian/patches/11f8eef5a9625c77f78a829406c446b615ed6168.patch deleted
=====================================
@@ -1,33 +0,0 @@
-From 11f8eef5a9625c77f78a829406c446b615ed6168 Mon Sep 17 00:00:00 2001
-From: Stefan Schulze Frielinghaus <stefansf at linux.ibm.com>
-Date: Wed, 11 Dec 2019 07:47:16 +0100
-Subject: [PATCH] fixup! Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
-
----
- libraries/base/GHC/ByteOrder.hs                | 2 +-
- libraries/base/GHC/IO/Encoding/CodePage/API.hs | 2 +-
- testsuite/tests/codeGen/should_run/T7600.hs    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/libraries/base/GHC/ByteOrder.hs
-+++ b/libraries/base/GHC/ByteOrder.hs
-@@ -21,7 +21,7 @@ module GHC.ByteOrder where
- #include <ghcautoconf.h>
- 
- -- Required for WORDS_BIGENDIAN
--#include "ghcautoconf.h"
-+#include <ghcautoconf.h>
- 
- -- | Byte ordering.
- data ByteOrder
---- a/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-+++ b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-@@ -11,7 +11,7 @@ module GHC.IO.Encoding.CodePage.API (
- #include <ghcautoconf.h>
- 
- -- Required for WORDS_BIGENDIAN
--#include "ghcautoconf.h"
-+#include <ghcautoconf.h>
- 
- import Foreign.C
- import Foreign.Ptr


=====================================
p/ghc/debian/patches/3c12355ece0fa14e534c71a9f7327eda9773fad9.patch deleted
=====================================
@@ -1,38 +0,0 @@
-From 3c12355ece0fa14e534c71a9f7327eda9773fad9 Mon Sep 17 00:00:00 2001
-From: Stefan Schulze Frielinghaus <stefansf at linux.ibm.com>
-Date: Mon, 9 Dec 2019 15:41:57 +0100
-Subject: [PATCH] Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
-
-Include header file `ghcautoconf.h` where the CPP macro
-`WORDS_BIGENDIAN` is defined. This finally fixes #17337 (in conjunction
-with commit 6c59cc71dc).
----
- libraries/base/GHC/ByteOrder.hs                | 3 +++
- libraries/base/GHC/IO/Encoding/CodePage/API.hs | 3 +++
- testsuite/tests/codeGen/should_run/T7600.hs    | 4 ++++
- 3 files changed, 10 insertions(+)
-
---- a/libraries/base/GHC/ByteOrder.hs
-+++ b/libraries/base/GHC/ByteOrder.hs
-@@ -20,6 +20,9 @@ module GHC.ByteOrder where
- -- Required for WORDS_BIGENDIAN
- #include <ghcautoconf.h>
- 
-+-- Required for WORDS_BIGENDIAN
-+#include "ghcautoconf.h"
-+
- -- | Byte ordering.
- data ByteOrder
-     = BigEndian    -- ^ most-significant-byte occurs in lowest address.
---- a/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-+++ b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-@@ -10,6 +10,9 @@ module GHC.IO.Encoding.CodePage.API (
- -- Required for WORDS_BIGENDIAN
- #include <ghcautoconf.h>
- 
-+-- Required for WORDS_BIGENDIAN
-+#include "ghcautoconf.h"
-+
- import Foreign.C
- import Foreign.Ptr
- import Foreign.Marshal


=====================================
p/ghc/debian/patches/series
=====================================
@@ -8,7 +8,5 @@ kfreebsd-aclocal.m4
 local-mathjax
 llvm-arm-unknown-linux-gnueabi.patch
 fix-32bit-atomic
-3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
-11f8eef5a9625c77f78a829406c446b615ed6168.patch
 haddock-remove-googleapis-fonts
 #fix-big-endian-ffi



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/b71043bded0729bc99d7fdd2b8eb2019d3e663ba

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/b71043bded0729bc99d7fdd2b8eb2019d3e663ba
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20210826/31fbb2fe/attachment-0001.htm>