From nobody Sat Mar 09 19:52:33 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsYbj3bqhz5DqfR; Sat, 9 Mar 2024 19:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsYbj2yfqz4RWp; Sat, 9 Mar 2024 19:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710013953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oOL3pIhIEBtNPaOg9bgYq0EiMlcCQsCPJBQIm/7J/U8=; b=NOfsCvrGY/rDTvEGQvjCLq7+cSuGSS6jY4P3T4B3PTt6pfX2U6qP5D0FNlpxeRNTRglN0S /OzWf+yatRNfSX0xd8htbDErhDXeq+rVxXCDQ5jJfRGEOua9ktTiWDVe5+hHn03rsftdrf AdPEWiESS+uOLwEOJCJ8p/dz1QfZataVJ2Z3ysvSyNjrxgLG0DhUnoEolpJccKfCVohbJY l7EfP4hrxK71Z1e9+oruntU7tULtQ12OYmGm+BMYeOMJSACwqv7H6UXV88oSNiN65uhQH+ iGXEchFfMWbNWMEJcXHAdOMwMTKwqhO16K2Cy9CpBYF1iOo4d/tp/A7V9mZjXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710013953; a=rsa-sha256; cv=none; b=t3e9oHV8a9lM5Iq9mBG4WOGD6cfDROfROjb1wB7ZwpDvKg6WrWprKlr6H2VERa3xhhU3IY jAu83twQvvrixjzdZaH9mMpYrKRHLlPxQ8szyYlkCAotCxB+M1VOkyFGbbf5fNYSUOtzID 0pz7Hyi/a9HgBBf/CKhU0xIdjBlMduxPdTa/x6WjwW+J5+DuZ0/3eq2guZIoFfcVljxPcL 4YC7V64O49xhz22u42rsAeIkvENlVXr4mYd7r+NgmViU/3l3xFPsyfWk6zfk1Af925PM5P lp4aMzfIqzoaNycPbw/kd7FXljElBcApZMxpqSP3oFGJ8EHPTSlHXAobWFb5jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710013953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oOL3pIhIEBtNPaOg9bgYq0EiMlcCQsCPJBQIm/7J/U8=; b=CgJMJLjTRPrhjBVZohB7hV4li0iA5PPMBHFPH24EmFKABIlVKjn59YHhVo3wVVmkIPZZlI Pdzzj9x1pcc9hzvFK63HXZKWg55VDM2eUD6LYsFDwHC+KvZc/1oPbW/XPT1JyixrcweOzi iVe++9dMm8+H7mfJ/Zoirj5MypJf1XQjrUQ4J6/0Xc26hBzoUgZSZXEqikAR1RrY9HoxJn icjWD1FKB28JeESa4mIG4mkJVC9k+cRpnTnjYKhkXVWELgEZ4VIfFCqMMc+HiKeU7wYgfq BrFw0G7gFkT2e3Z3QYb/lvvX2ytgOSy9XXoLqZcUdCjJ/Kq0v1AyePX7FOCDEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsYbj2YtjzFhZ; Sat, 9 Mar 2024 19:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 429JqXJh010321; Sat, 9 Mar 2024 19:52:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429JqX4p010318; Sat, 9 Mar 2024 19:52:33 GMT (envelope-from git) Date: Sat, 9 Mar 2024 19:52:33 GMT Message-Id: <202403091952.429JqX4p010318@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 973a7aaf4838 - main - lang/ghc: Use SETENVI for gmake invocations List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 973a7aaf4838d29069505a49f9f6a8248b4f57d8 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=973a7aaf4838d29069505a49f9f6a8248b4f57d8 commit 973a7aaf4838d29069505a49f9f6a8248b4f57d8 Author: Gleb Popov AuthorDate: 2024-03-09 19:50:49 +0000 Commit: Gleb Popov CommitDate: 2024-03-09 19:51:30 +0000 lang/ghc: Use SETENVI for gmake invocations PR: 277492 --- lang/ghc/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index c5d1a0942b60..0b082f2cf8b3 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -212,7 +212,7 @@ pre-configure: # 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} ${GMAKE} PACKAGES='' install .endif .ifdef USE_HADRIAN # Compile Hadrian @@ -273,7 +273,7 @@ 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} ${GMAKE} 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} \ @@ -292,7 +292,7 @@ create-bootstrap: create-stack-bindist: .ifndef USE_HADRIAN cd ${WRKSRC} \ - && ${GMAKE} binary-dist TAR_COMP=xz \ + && ${SETENVI} ${WRK_ENV} ${GMAKE} binary-dist TAR_COMP=xz \ && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ .else cd ${WRKSRC} \ @@ -337,7 +337,7 @@ check-hadrian-bootstrap: ${FALSE} .endif # Install bootstrap GHC - ${MAKE} -C ${.CURDIR} pre-configure + ${MAKE_CMD} -C ${.CURDIR} pre-configure # Compile Hadrian cd ${WRKSRC}/hadrian/bootstrap && \ ./bootstrap.py -w ${BOOT_GHC} -s /tmp/hadrian-${GHC_VERSION}-boot.tar.gz