subject:"A couple more lang\/ghc fixups"

Re: A couple more lang/ghc fixups

2024-02-01 Thread Matthias Kilian

Hi,

On Sat, Jan 27, 2024 at 10:49:42PM -0800, Greg Steuck wrote:
> Now that we landed ghc-9.6 is a good time to have `make test` fixed. It
> took some doing to have them all fixed upstream and even then some of the
> fixes are still not in 9.6. Anyway, OK?

Ok.

Ciao,
Kili

> ---
>  lang/ghc/Makefile | 20 ++--
>  lang/ghc/distinfo |  2 --
>  2 files changed, 2 insertions(+), 20 deletions(-)
> 
> diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
> index 9aa4f19d65c..1612e816c88 100644
> --- a/lang/ghc/Makefile
> +++ b/lang/ghc/Makefile
> @@ -39,8 +39,8 @@ LIB_DEPENDS =   converters/libiconv \
>   devel/libffi
>  
>  BUILD_DEPENDS =  archivers/bzip2 \
> - archivers/gtar \
> - textproc/py-sphinx${MODPY_FLAVOR}>=4.0.2
> + archivers/gtar
> +
>  RUN_DEPENDS =
>  
>  SITES =  
> https://downloads.haskell.org/ghc/${GHC_VERSION}/
> @@ -61,17 +61,7 @@ DISTFILES.boot =   ${BINDISTFILE-${MACHINE_ARCH}}
>  DISTFILES.noextract =hadrian-sources-${BIN_VER}.tar.gz
>  SITES.noextract =https://openbsd.dead-parrot.de/distfiles/
>  
> -# sphinx-rtd-theme update patch set
> -# mirrored from 
> https://gitlab.haskell.org/ghc/ghc/-/commit/70526f5bd8886126f49833ef20604a2c6477780a.patch
> -# "GIT binary patch" (gpatch doesn't handle it, patch segfaults)
> -# (sorry! -sthen)
> -SITES.p =https://spacehopper.org/mirrors/
> -DISTFILES.p +=   ghc-rtd-update-70526f5bd8.diff
>  EXTRACT_ONLY =   ${DISTFILES} ${DISTFILES.boot}
> -BUILD_DEPENDS += devel/git
> -pre-patch:
> - cd ${WRKSRC}; env -i git apply 
> ${FULLDISTDIR}/ghc-rtd-update-70526f5bd8.diff
> -
>  
>  # Substvars for all libraries, assuming that ghc-boot, ghc-boot-th,
>  # ghc-heap and ghci will always have the same version number as ghc.
> @@ -136,9 +126,6 @@ CONFIGURE_ENV +=  
> CONF_GCC_LINKER_OPTS_STAGE0="${GHC_CC_OPTS}" \
>   CONF_GCC_LINKER_OPTS_STAGE2="${GHC_CC_OPTS}" \
>   CONF_CC_OPTS_STAGE2="${GHC_CC_OPTS}"
>  
> -# Do not pick up gpatch
> -CONFIGURE_ENV += ac_cv_path_PatchCmd=/usr/bin/patch
> -
>  MAKE_FLAGS +=StripLibraries=YES \
>   INSTALL_BIN_OPTS=-s \
>   HSCOLOUR_SRCS=NO \
> @@ -147,9 +134,6 @@ MAKE_FLAGS += StripLibraries=YES \
>  # haddock: ... : commitBuffer: invalid argument (invalid character)
>  MAKE_ENV =   LC_ALL=en_US.UTF-8
>  
> -# For mktexpk (via dvips when building the PostScript documentation):
> -PORTHOME =   ${WRKDIR}
> -
>  TEST_DEPENDS =   print/ghostscript/gnu ${MODPY_RUN_DEPENDS}
>  
>  post-extract:
> diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
> index 2a2065aa251..3c92fd3f3be 100644
> --- a/lang/ghc/distinfo
> +++ b/lang/ghc/distinfo
> @@ -2,11 +2,9 @@ SHA256 (ghc/ghc-9.6.4.20240111-amd64.tar.xz) = 
> CedJ29vBFZyl1e+DgcUqPfjHMDRKmEOsX
>  SHA256 (ghc/ghc-9.6.4.20240111-shlibs-amd64.tar.gz) = 
> Nb3trqnIF8H5kfKEkeGLr+sl4rPeFsbW/gfkelRprrY=
>  SHA256 (ghc/ghc-9.6.4-src.tar.xz) = 
> EL8luLBxdP3ZhotcDFbBfA7x7ctiR7S4ZL6TNlG/1MA=
>  SHA256 (ghc/ghc-9.6.4-testsuite.tar.xz) = 
> bhMoL76//b+gpJiJQ3REyakM/ldgxHlpzUJFhUwzjXM=
> -SHA256 (ghc/ghc-rtd-update-70526f5bd8.diff) = 
> maCALPRglB5J9LJEQxBqMGdVbH4qK2gqVuaU5xmYdNU=
>  SHA256 (ghc/hadrian-sources-9.6.4.20240111.tar.gz) = 
> wMMJfyP7Pr6xjb/tj9Kz5iZugGr6+duMwJ23aGsUWy0=
>  SIZE (ghc/ghc-9.6.4-src.tar.xz) = 29451856
>  SIZE (ghc/ghc-9.6.4-testsuite.tar.xz) = 7075820
>  SIZE (ghc/ghc-9.6.4.20240111-amd64.tar.xz) = 74706384
>  SIZE (ghc/ghc-9.6.4.20240111-shlibs-amd64.tar.gz) = 3544885
> -SIZE (ghc/ghc-rtd-update-70526f5bd8.diff) = 4245853
>  SIZE (ghc/hadrian-sources-9.6.4.20240111.tar.gz) = 2125322
> \ No newline at end of file
> -- 
> 2.43.0
> 
> >From 11e6bf454004e8e60894c7259f8c3a8fbd49525d Mon Sep 17 00:00:00 2001
> From: Greg Steuck 
> Date: Sat, 27 Jan 2024 19:16:24 -0800
> Subject: [PATCH 2/2] Fix `make test` in lang/ghc
> 
> ---
>  lang/ghc/Makefile | 31 ++-
>  .../patches/patch-compiler_GHC_Unit_State_hs  |  2 +-
>  .../patch-libraries_process_tests_all_T   | 12 +++
>  .../patches/patch-testsuite_driver_testlib_py | 10 +++---
>  4 files changed, 33 insertions(+), 22 deletions(-)
>  create mode 100644 lang/ghc/patches/patch-libraries_process_tests_all_T
> 
> diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
> index 1612e816c88..dc02ebab65a 100644
> --- a/lang/ghc/Makefile
> +++ b/lang/ghc/Makefile
> @@ -132,7 +132,7 @@ MAKE_FLAGS += StripLibraries=YES \
>   BUILD_SPHINX_PDF=NO
>  
>  # haddock: ... : commitBuffer: invalid argument (invalid character)
> -MAKE_ENV =   LC_ALL=en_US.UTF-8
> +MAKE_ENV +=  LC_ALL=en_US.UTF-8
>  
>  TEST_DEPENDS =   print/ghostscript/gnu ${MODPY_RUN_DEPENDS}
>  
> @@ -162,17 +162,20 @@ post-patch:
>   cd ${WRKSRC} && \
>   ${MODPY_BIN}

A couple more lang/ghc fixups

2024-01-27 Thread Greg Steuck

Now that we landed ghc-9.6 is a good time to have `make test` fixed. It
took some doing to have them all fixed upstream and even then some of the
fixes are still not in 9.6. Anyway, OK?

>From fe0577aab710d1a3c5c5e4178088ffe96a2da07d Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 14 Jan 2024 14:20:59 -0800
Subject: [PATCH 1/2] Remove sphinx dependency now that we no longer build
 lang/ghc docs

---
 lang/ghc/Makefile | 20 ++--
 lang/ghc/distinfo |  2 --
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 9aa4f19d65c..1612e816c88 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -39,8 +39,8 @@ LIB_DEPENDS = converters/libiconv \
devel/libffi
 
 BUILD_DEPENDS =archivers/bzip2 \
-   archivers/gtar \
-   textproc/py-sphinx${MODPY_FLAVOR}>=4.0.2
+   archivers/gtar
+
 RUN_DEPENDS =
 
 SITES =
https://downloads.haskell.org/ghc/${GHC_VERSION}/
@@ -61,17 +61,7 @@ DISTFILES.boot = ${BINDISTFILE-${MACHINE_ARCH}}
 DISTFILES.noextract =  hadrian-sources-${BIN_VER}.tar.gz
 SITES.noextract =  https://openbsd.dead-parrot.de/distfiles/
 
-# sphinx-rtd-theme update patch set
-# mirrored from 
https://gitlab.haskell.org/ghc/ghc/-/commit/70526f5bd8886126f49833ef20604a2c6477780a.patch
-# "GIT binary patch" (gpatch doesn't handle it, patch segfaults)
-# (sorry! -sthen)
-SITES.p =  https://spacehopper.org/mirrors/
-DISTFILES.p += ghc-rtd-update-70526f5bd8.diff
 EXTRACT_ONLY = ${DISTFILES} ${DISTFILES.boot}
-BUILD_DEPENDS +=   devel/git
-pre-patch:
-   cd ${WRKSRC}; env -i git apply 
${FULLDISTDIR}/ghc-rtd-update-70526f5bd8.diff
-
 
 # Substvars for all libraries, assuming that ghc-boot, ghc-boot-th,
 # ghc-heap and ghci will always have the same version number as ghc.
@@ -136,9 +126,6 @@ CONFIGURE_ENV +=
CONF_GCC_LINKER_OPTS_STAGE0="${GHC_CC_OPTS}" \
CONF_GCC_LINKER_OPTS_STAGE2="${GHC_CC_OPTS}" \
CONF_CC_OPTS_STAGE2="${GHC_CC_OPTS}"
 
-# Do not pick up gpatch
-CONFIGURE_ENV +=   ac_cv_path_PatchCmd=/usr/bin/patch
-
 MAKE_FLAGS +=  StripLibraries=YES \
INSTALL_BIN_OPTS=-s \
HSCOLOUR_SRCS=NO \
@@ -147,9 +134,6 @@ MAKE_FLAGS +=   StripLibraries=YES \
 # haddock: ... : commitBuffer: invalid argument (invalid character)
 MAKE_ENV = LC_ALL=en_US.UTF-8
 
-# For mktexpk (via dvips when building the PostScript documentation):
-PORTHOME = ${WRKDIR}
-
 TEST_DEPENDS = print/ghostscript/gnu ${MODPY_RUN_DEPENDS}
 
 post-extract:
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 2a2065aa251..3c92fd3f3be 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -2,11 +2,9 @@ SHA256 (ghc/ghc-9.6.4.20240111-amd64.tar.xz) = 
CedJ29vBFZyl1e+DgcUqPfjHMDRKmEOsX
 SHA256 (ghc/ghc-9.6.4.20240111-shlibs-amd64.tar.gz) = 
Nb3trqnIF8H5kfKEkeGLr+sl4rPeFsbW/gfkelRprrY=
 SHA256 (ghc/ghc-9.6.4-src.tar.xz) = 
EL8luLBxdP3ZhotcDFbBfA7x7ctiR7S4ZL6TNlG/1MA=
 SHA256 (ghc/ghc-9.6.4-testsuite.tar.xz) = 
bhMoL76//b+gpJiJQ3REyakM/ldgxHlpzUJFhUwzjXM=
-SHA256 (ghc/ghc-rtd-update-70526f5bd8.diff) = 
maCALPRglB5J9LJEQxBqMGdVbH4qK2gqVuaU5xmYdNU=
 SHA256 (ghc/hadrian-sources-9.6.4.20240111.tar.gz) = 
wMMJfyP7Pr6xjb/tj9Kz5iZugGr6+duMwJ23aGsUWy0=
 SIZE (ghc/ghc-9.6.4-src.tar.xz) = 29451856
 SIZE (ghc/ghc-9.6.4-testsuite.tar.xz) = 7075820
 SIZE (ghc/ghc-9.6.4.20240111-amd64.tar.xz) = 74706384
 SIZE (ghc/ghc-9.6.4.20240111-shlibs-amd64.tar.gz) = 3544885
-SIZE (ghc/ghc-rtd-update-70526f5bd8.diff) = 4245853
 SIZE (ghc/hadrian-sources-9.6.4.20240111.tar.gz) = 2125322
\ No newline at end of file
-- 
2.43.0

>From 11e6bf454004e8e60894c7259f8c3a8fbd49525d Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sat, 27 Jan 2024 19:16:24 -0800
Subject: [PATCH 2/2] Fix `make test` in lang/ghc

---
 lang/ghc/Makefile | 31 ++-
 .../patches/patch-compiler_GHC_Unit_State_hs  |  2 +-
 .../patch-libraries_process_tests_all_T   | 12 +++
 .../patches/patch-testsuite_driver_testlib_py | 10 +++---
 4 files changed, 33 insertions(+), 22 deletions(-)
 create mode 100644 lang/ghc/patches/patch-libraries_process_tests_all_T

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 1612e816c88..dc02ebab65a 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -132,7 +132,7 @@ MAKE_FLAGS +=   StripLibraries=YES \
BUILD_SPHINX_PDF=NO
 
 # haddock: ... : commitBuffer: invalid argument (invalid character)
-MAKE_ENV = LC_ALL=en_US.UTF-8
+MAKE_ENV +=LC_ALL=en_US.UTF-8
 
 TEST_DEPENDS = print/ghostscript/gnu ${MODPY_RUN_DEPENDS}
 
@@ -162,17 +162,20 @@ post-patch:
cd ${WRKSRC} && \
${MODPY_BIN} hadrian/bootstrap/bootstrap.py --no-archive -w ../bin/ghc \
-s

Re: A couple more lang/ghc fixups

A couple more lang/ghc fixups

2 matches

Site Navigation

Mail list logo

Footer information