Attachment 248952 Details for Bug 277492 – patch

[patch] patch

ghc-gmake4.4.patch (text/plain), 3.24 KB, created by Tijl Coosemans on 2024-03-05 15:48:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2024-03-05 15:48:36 UTC

Size: 3.24 KB

patch

obsolete

>diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
>index 184c10d7de70..53565cd1e6e2 100644
>--- a/lang/ghc/Makefile
>+++ b/lang/ghc/Makefile
>@@ -208,21 +208,21 @@ post-patch:
> 
> pre-configure:
> 	# Call the bootstrap script
>-	cd ${WRKSRC}/ && ${BOOT_SCRIPT}
>+	cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${BOOT_SCRIPT}
> # If we are using bootstrap compiler, configure and install it into ${BOOT_DIR}
> .if empty(PORT_OPTIONS:MBOOT)
>-	cd ${BOOT_DIR} && ${CONFIGURE_CMD} ${CONFIGURE_ENV} --prefix=${BOOT_INSTALL_DIR}
>-	cd ${BOOT_DIR} && ${MAKE_CMD} PACKAGES='' install
>+	cd ${BOOT_DIR} && ${SETENVI} ${WRK_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ENV} --prefix=${BOOT_INSTALL_DIR}
>+	cd ${BOOT_DIR} && ${SETENVI} ${WRK_ENV} ${MAKE_CMD} PACKAGES='' install
> .endif
> .ifdef USE_HADRIAN
> # Compile Hadrian
>-	cd ${WRKSRC}/hadrian/bootstrap && \
>+	cd ${WRKSRC}/hadrian/bootstrap && ${SETENVI} ${WRK_ENV} \
> 		./bootstrap.py -w ${BOOT_GHC} -s ${DISTDIR}/hadrian-${GHC_VERSION}-boot.tar.gz
> .endif
> 
> .ifdef USE_HADRIAN
> pre-install:
>-	cd ${INSTALL_WRKSRC} && ${CONFIGURE_CMD} ${CONFIGURE_ENV} --prefix=${PREFIX}
>+	cd ${INSTALL_WRKSRC} && ${SETENVI} ${WRK_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ENV} --prefix=${PREFIX}
> .endif
> 
> post-install:
>@@ -273,11 +273,11 @@ create-bootstrap:
> 		&& ${ECHO_CMD} "BIN_DIST_NAME=ghc-${GHC_VERSION}-boot" >> mk/build.mk \
> 		&& ${ECHO_CMD} "BIN_DIST_TAR=ghc-${GHC_VERSION}-boot.tar" >> mk/build.mk \
> 		&& ${ECHO_CMD} "HADDOCK_DOCS=NO" >> mk/build.mk \
>-		&& ${GMAKE} binary-dist TAR_COMP=xz \
>+		&& ${SETENVI} ${WRK_ENV} ${MAKE_CMD} binary-dist TAR_COMP=xz \
> 		&& ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-boot-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
> .else
> 	cd ${WRKSRC} \
>-		&& ${HADRIAN_CMD} binary-dist-xz \
>+		&& ${SETENVI} ${WRK_ENV} ${HADRIAN_CMD} binary-dist-xz \
> 		&& ${MV} ${WRKSRC}/_build/bindist/ghc-${GHC_VERSION}-${CONFIGURE_TARGET}.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
> .endif
> 
>@@ -292,11 +292,11 @@ create-bootstrap:
> create-stack-bindist:
> .ifndef USE_HADRIAN
> 	cd ${WRKSRC} \
>-		&& ${GMAKE} binary-dist TAR_COMP=xz \
>+		&& ${SETENVI} ${WRK_ENV} ${MAKE_CMD} binary-dist TAR_COMP=xz \
> 		&& ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/
> .else
> 	cd ${WRKSRC} \
>-		&& ${HADRIAN_CMD} binary-dist-xz \
>+		&& ${SETENVI} ${WRK_ENV} ${HADRIAN_CMD} binary-dist-xz \
> 		&& ${MV} ${WRKSRC}/_build/bindist/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/
> .endif
> 
>@@ -320,7 +320,7 @@ create-hadrian-bootstrap:
> # We always would need to create our own plan.json file and put it into PATCHDIR:
> # Predefined plans use integer-gmp, while we build bootstraps with integer-simple
> # Predefined plans aren't pretty-printed, so we can't easily patch them
>-	cd ${WRKSRC}/hadrian/bootstrap && \
>+	cd ${WRKSRC}/hadrian/bootstrap && ${SETENVI} ${WRK_ENV} \
> 		./bootstrap.py -w ${BOOT_GHC} --deps ${HADRIAN_PLAN} fetch -o /tmp/hadrian-${GHC_VERSION}-boot
> 
> 	@cd /tmp \
>@@ -339,7 +339,7 @@ check-hadrian-bootstrap:
> # Install bootstrap GHC
> 	${MAKE} -C ${.CURDIR} pre-configure
> # Compile Hadrian
>-	cd ${WRKSRC}/hadrian/bootstrap && \
>+	cd ${WRKSRC}/hadrian/bootstrap && ${SETENVI} ${WRK_ENV} \
> 		./bootstrap.py -w ${BOOT_GHC} -s /tmp/hadrian-${GHC_VERSION}-boot.tar.gz
> 
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 277492: 248952 | 248960