From nobody Wed Jul 27 14:56:47 2022 X-Original-To: dev-commits-ports-all@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 4LtH1C3GGgz4Xlh2; Wed, 27 Jul 2022 14:56:47 +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 4LtH1C2Z2cz3lp4; Wed, 27 Jul 2022 14:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658933807; 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=w5GnDmgmUXs5P140XvFDFaMd06s9zgPmCtIZKSsOXdk=; b=VfA8idCsJULLaDRcmyAz0uopBLTgXLgN91sDUkXDIKxU2dwBdX9z6k3ZFz2CcquvHzbEbG KWF3n+h4ArqYvS7wwPeRF7DxLt6W59xcmwMG+1XftvgfiCSQ/n62m9P9JEx/0NQH3Alw2B b4rBxk+sBBknonS7ukMZjxABpZ46mGyfvSTAcjYuG62xvO8w6LuILu6jJd/YcQdYr7oPNs S5rKn2W2YA9ogoV2se8gh6Laq0UnBVWvK99lVKHOlhWdFgjTvlWGRlbQTNPDVoP5h224ew mM3SAVzDzLyEfj59spscvZmHlNrA1Hwdux1esRUPa9arBuEy6YYoNjuRSkRlTg== 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 4LtH1C1DqhzLXG; Wed, 27 Jul 2022 14:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26REulxH005089; Wed, 27 Jul 2022 14:56:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26REulbu005088; Wed, 27 Jul 2022 14:56:47 GMT (envelope-from git) Date: Wed, 27 Jul 2022 14:56:47 GMT Message-Id: <202207271456.26REulbu005088@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: 4ad8bbf22f2b - main - Uses/cabal.mk: Use cabal2tuple in the make-use-cabal target. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 4ad8bbf22f2b9aaa79caccba7559b058245e12a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658933807; 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=w5GnDmgmUXs5P140XvFDFaMd06s9zgPmCtIZKSsOXdk=; b=uSuIu4QocrXs6DkjJXVnNAqE8Kd3Dosovn86LkJrWl5mwrKeBmt/yxBdmdWYq9J+PoobuL 7gV7ugqvDD2mbbC3FdE0bNDlqHCsm5zoVBVN7DTglx8tyLMqBm8uTyFb7XE5snymGoi6Pi SA2f+NLLQUivkbX8i6G6YjWnOWeDAhA23srTk/p9Dj+T6xgXuaMw+d5aYZCiyhigjkxnEo WOkgOyxLjfXSxenQt3UKD7hv3PjSvzeibtomrlFnYA3/J888EkiCh13Bk+tVklzBXvsQkZ Uny4aQqvp/Fa5MrPZTTx/LAgajQiV1eCdx+StWX6HPvo0M/rf6ALUFPb5YUZcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658933807; a=rsa-sha256; cv=none; b=FPXNt7XGQKdT0b1WVYwD1WBqsrxtgDm5EWbXgS+lgdM3aeDK0ADtvYrVzoXyJA3D6UdwSF TSBaAKT14ihdM/KtqCh3Fu10hFsKMcTl1tMQ/7zH75dfuODyUkKjBfqAtvkJTZ3NYnYaGg u7kFpwcvJbrfECgURzd7aFXhz01Ixq8wU2/ZpAOy1w8lgJo47fTu0/plcGk82ifol7dbbn TtL9gbE9DEP7Gqf41Wj4PL9PZK/rY80FKjxnNBNq7ff7RWySIorVVv/ezq21TlMYYKRmrp L0xwb3NIief3VKM8eRRQ7pesrwxHNYyu2tpp4YZn5dnLYFHxwRX/8KCHfjEPMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ad8bbf22f2b9aaa79caccba7559b058245e12a7 commit 4ad8bbf22f2b9aaa79caccba7559b058245e12a7 Author: Gleb Popov AuthorDate: 2022-07-16 11:56:49 +0000 Commit: Gleb Popov CommitDate: 2022-07-27 14:55:49 +0000 Uses/cabal.mk: Use cabal2tuple in the make-use-cabal target. --- Mk/Uses/cabal.mk | 71 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 3abd74489fac..dd7f0d917dbe 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -66,6 +66,8 @@ PKGNAMEPREFIX?= hs- EXECUTABLES?= ${PORTNAME} +CABAL_CMD?= cabal +CABAL_PORT= devel/hs-cabal-install CABAL_HOME= ${WRKDIR}/cabal-home CABAL_LIBEXEC= libexec/cabal CABAL_EXTRACT_SUFX= .tar.gz @@ -73,6 +75,9 @@ CABAL_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/powerpc64/ppc64/} CABAL_DEPSDIR= ${WRKSRC}/${CABAL_DEPS_SUBDIR} CABAL_DEPS_SUBDIR= _cabal_deps +HPACK_CMD?= hpack +_CABAL2TUPLE_CMD= cabal2tuple + . if defined(BUILD_DEPENDS) && ${BUILD_DEPENDS:Mghc?*\:lang/ghc?*} CABAL_WITH_ARGS= --with-compiler=${BUILD_DEPENDS:Mghc?*\:lang/ghc?*:C/\:.*//} \ --with-hsc2hs=${LOCALBASE}/bin/hsc2hs-${BUILD_DEPENDS:Mghc?*\:lang/ghc?*:C/\:.*//} @@ -81,16 +86,14 @@ BUILD_DEPENDS+= ghc:lang/ghc . endif . if !defined(CABAL_BOOTSTRAP) -BUILD_DEPENDS+= cabal:devel/hs-cabal-install +BUILD_DEPENDS+= cabal:${CABAL_PORT} . endif . if ${cabal_ARGS:Mhpack} EXTRACT_DEPENDS+= hpack:devel/hs-hpack . endif -# Inherited via lang/ghc we need to depend on iconv and libgmp.so (stage q/a) -iconv_ARGS= translit -.include "${USESDIR}/iconv.mk" +# Inherited via lang/ghc we need to depend on libffi.so and libgmp.so (stage q/a) LIB_DEPENDS+= libgmp.so:math/gmp \ libffi.so:devel/libffi @@ -152,50 +155,50 @@ DISTFILES+= ${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal:${p # Auxiliary targets used during port creation/updating. # Fetches and unpacks package source from Hackage using only PORTNAME and PORTVERSION. -cabal-extract: ${WRKDIR} +cabal-extract: check-cabal ${WRKDIR} + @${ECHO_MSG} "===> Fetching Cabal package index into ${CABAL_HOME}/.cabal" ${RM} -rf ${CABAL_HOME}/.cabal - ${SETENV} HOME=${CABAL_HOME} cabal new-update + ${SETENV} HOME=${CABAL_HOME} ${CABAL_CMD} update . if ${_hackage_is_default} == yes cd ${WRKDIR} && \ - ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} cabal get ${PORTNAME}-${PORTVERSION} + ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} get ${PORTNAME}-${PORTVERSION} . else ${MV} ${CABAL_HOME} /tmp/${PORTNAME}-cabal-home cd ${.CURDIR} && ${MAKE} extract CABAL_BOOTSTRAP=yes ${RM} -rf ${CABAL_HOME} ${MV} /tmp/${PORTNAME}-cabal-home ${CABAL_HOME} -. endif - -# Fetches and unpacks dependencies sources for a cabal-extract'ed package. -# Builds them as side-effect. -. if !target(cabal-extract-deps) -cabal-extract-deps: . if ${cabal_ARGS:Mhpack} - cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} hpack + @${ECHO_MSG} "===> Running ${HPACK_CMD} to generate .cabal file" + cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} ${HPACK_CMD} . endif +. endif + +# Calls cabal configure on the Haskell package located in ${WRKSRC} +cabal-configure: check-cabal cd ${WRKSRC} && \ - ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} cabal new-configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CONFIGURE_ARGS} + ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CONFIGURE_ARGS} + +# Calls cabal build on the Haskell package located in ${WRKSRC} +cabal-build: check-cabal cd ${WRKSRC} && \ - ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} cabal new-build --disable-benchmarks --disable-tests --dependencies-only ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} -. endif + ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} -# Generates USE_CABAL= ... line ready to be pasted into the port based on artifacts of cabal-extract-deps. -make-use-cabal: - @echo ==================== - @echo -n USE_CABAL= - @find ${CABAL_HOME} -name '*.conf' -exec basename {} + | sed -E 's|-[0-9a-z]{64}\.conf||' | sort | sed 's/$$/ \\/' - @find ${CABAL_HOME} -name 'hsc2hs*.tar.gz' -exec basename {} + | sed -E 's|\.tar\.gz||' | sed 's/$$/ \\/' - @find ${CABAL_HOME} -name 'alex*.tar.gz' -exec basename {} + | sed -E 's|\.tar\.gz||' | sed 's/$$/ \\/' - @find ${CABAL_HOME} -name 'happy*.tar.gz' -exec basename {} + | sed -E 's|\.tar\.gz||' | sed 's/$$/ \\/' - -# Re-generates USE_CABAL items to have revision numbers. -make-use-cabal-revs: -. for package in ${_use_cabal} - @(${SETENV} HTTP_ACCEPT="application/json" fetch -q -o - http://hackage.haskell.org/package/${package:C/_[0-9]+//}/revisions/ | python3 -c "import sys, json; print(('${package:C/_[0-9]+//}_' + str(json.load(sys.stdin)[-1]['number'])).replace('_0',''), end='')") - @echo ' \' -. endfor +# Generates USE_CABAL= ... line ready to be pasted into the port based on the plan.json file generated by cabal configure. +make-use-cabal: check-cabal2tuple + @${ECHO_MSG} "===> Processing plan.json" + @${_CABAL2TUPLE_CMD} ${WRKSRC} || (${ECHO_CMD} "Did you forget to make cabal-configure ?" ; exit 1) -. if !defined(CABAL_BOOTSTRAP) +check-cabal: + @if ! type ${CABAL_CMD} > /dev/null 2>&1; then \ + ${ECHO_MSG} "===> cabal executable not found, install ${CABAL_PORT} or set CABAL_CMD"; exit 1; \ + fi; \ + +check-cabal2tuple: + @if ! type ${_CABAL2TUPLE_CMD} > /dev/null 2>&1; then \ + ${ECHO_MSG} "===> cabal2tuple executable not found, install \"ports-mgmt/hs-cabal2tuple\""; exit 1; \ + fi +. if !defined(CABAL_BOOTSTRAP) # Main targets implementation. cabal-post-extract: @@ -245,7 +248,7 @@ cabal-pre-configure: . if !target(do-build) do-build: cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} cabal new-build --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET} + ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} new-build --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET} . endif . if !target(do-install)