From eb4a21a677d56c160eee6573402ec0412d46f819 Mon Sep 17 00:00:00 2001 From: Olivier Benz <olivier.benz@b-data.ch> Date: Fri, 12 Jul 2024 09:27:11 +0200 Subject: [PATCH] Add comment regarding patch --- latest.Dockerfile | 4 +++- prior/9.6.5.Dockerfile | 4 +++- prior/9.6.6.Dockerfile | 4 +++- prior/9.8.2.Dockerfile | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/latest.Dockerfile b/latest.Dockerfile index a764cd6..435b339 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -45,9 +45,11 @@ RUN cd /tmp \ && gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \ && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \ && cd "ghc-$GHC_VERSION" \ - # Apply patches + ## Apply patch: Bump max LLVM version to 19 (not inclusive) + ## https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12726 && mv "/tmp/$GHC_VERSION.patch" . \ && patch -p0 <"$GHC_VERSION.patch" \ + ## Configure and build && ./boot.source \ && ./configure \ ## Use the LLVM backend diff --git a/prior/9.6.5.Dockerfile b/prior/9.6.5.Dockerfile index 53b7244..0107db6 100644 --- a/prior/9.6.5.Dockerfile +++ b/prior/9.6.5.Dockerfile @@ -44,9 +44,11 @@ RUN cd /tmp \ && gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \ && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \ && cd "ghc-$GHC_VERSION" \ - # Apply patches + ## Apply patch: Bump max LLVM version to 19 (not inclusive) + ## https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12726 && mv "/tmp/$GHC_VERSION.patch" . \ && patch -p0 <"$GHC_VERSION.patch" \ + ## Configure and build && ./boot.source \ && ./configure --disable-ld-override LD=ld.gold \ ## Use the LLVM backend diff --git a/prior/9.6.6.Dockerfile b/prior/9.6.6.Dockerfile index 504e95f..bea6047 100644 --- a/prior/9.6.6.Dockerfile +++ b/prior/9.6.6.Dockerfile @@ -44,9 +44,11 @@ RUN cd /tmp \ && gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \ && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \ && cd "ghc-$GHC_VERSION" \ - # Apply patches + ## Apply patch: Bump max LLVM version to 19 (not inclusive) + ## https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12726 && mv "/tmp/$GHC_VERSION.patch" . \ && patch -p0 <"$GHC_VERSION.patch" \ + ## Configure and build && ./boot.source \ && ./configure --disable-ld-override LD=ld.gold \ ## Use the LLVM backend diff --git a/prior/9.8.2.Dockerfile b/prior/9.8.2.Dockerfile index fc522d4..4d4fcb2 100644 --- a/prior/9.8.2.Dockerfile +++ b/prior/9.8.2.Dockerfile @@ -44,9 +44,11 @@ RUN cd /tmp \ && gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \ && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \ && cd "ghc-$GHC_VERSION" \ - # Apply patches + ## Apply patch: Bump max LLVM version to 19 (not inclusive) + ## https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12726 && mv "/tmp/$GHC_VERSION.patch" . \ && patch -p0 <"$GHC_VERSION.patch" \ + ## Configure and build && ./boot.source \ && ./configure --disable-ld-override LD=ld.gold \ ## Use the LLVM backend -- GitLab