Date: Sat, 27 Jul 2019 07:51:21 +0200 From: Tobias Kortkamp <tobik@freebsd.org> To: Gleb Popov <arrowd@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r507361 - head/Mk/Uses Message-ID: <20190727055121.GA99138@urd.tobik.me> In-Reply-To: <201907261652.x6QGqoxC018196@repo.freebsd.org> References: <201907261652.x6QGqoxC018196@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--lrZ03NoBR/3+SXJZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 26, 2019 at 04:52:50PM +0000, Gleb Popov wrote: > Author: arrowd > Date: Fri Jul 26 16:52:49 2019 > New Revision: 507361 > URL: https://svnweb.freebsd.org/changeset/ports/507361 >=20 > Log: > Add support for USES=3D cabal:hpack and document this option. >=20 > Modified: > head/Mk/Uses/cabal.mk >=20 > Modified: head/Mk/Uses/cabal.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/Mk/Uses/cabal.mk Fri Jul 26 16:46:46 2019 (r507360) > +++ head/Mk/Uses/cabal.mk Fri Jul 26 16:52:49 2019 (r507361) > @@ -2,9 +2,13 @@ > # > # Provide support for building Haskell packages using Cabal. > # > -# Feature: cabal > -# Usage: USES=3Dcabal > +# Feature: cabal > +# Usage: USES=3Dcabal or USES=3Dcabal:ARGS > +# Valid ARGS: hpack > # > +# hpack: The port doesn't have a .cabal file and needs devel/hs-hpack to > +# generate it from package.yaml file > +# > # Variables, which can be set by the port: > # > # USE_CABAL List of Haskell packages required to build a port. > @@ -36,10 +40,6 @@ > .if !defined(_INCLUDE_USES_CABAL_MK) > _INCLUDE_USES_CABAL_MK=3D yes > =20 > -.if !empty(cabal_ARGS) > -IGNORE=3D Incorrect 'USES=3D cabal:${cabal_ARGS}' cabal takes no argume= nts > -.endif > - Nothing checks USES=3Dcabal args now and it accepts any garbage arguments like USES=3Dcabal:asdfasd. Please put back some check for invalid arguments. Index: Mk/Uses/cabal.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Mk/Uses/cabal.mk (revision 507380) +++ Mk/Uses/cabal.mk (working copy) @@ -40,6 +40,10 @@ .if !defined(_INCLUDE_USES_CABAL_MK) _INCLUDE_USES_CABAL_MK=3D yes =20 +.if !empty(cabal_ARGS:Nhpack) +IGNORE=3D USES=3Dcabal has invalid arguments: ${cabal_ARGS:Nhpack} +.endif + PKGNAMEPREFIX?=3D hs- =20 EXECUTABLES?=3D ${PORTNAME} --lrZ03NoBR/3+SXJZ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEElXvTEJc6ePgdQuobpPCftzzFH2EFAl075lVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk1 N0JEMzEwOTczQTc4RjgxRDQyRUExQkE0RjA5RkI3M0NDNTFGNjEACgkQpPCftzzF H2HpBAf/RTLrbl2k/OQcukBu7ySD7QkTygaOxFRN1TmffC4sGLvsPZ5nhJZUhW2s +nO0QYck+kbYXecLfpZ3gfeCP/eoXA4myWwWEMbbOLnxkP5pQIKx1PBciLysJyoq IrU0SUohbJXNzaUabXqnJCZQ5QkN1CqY3ySY+FkiYVqKa9wZquxacYJ834CwyFuh jQhSxPCcrG1mTBiTxDvKqnt2EdFySaCka/6kBDXm0rfLWYl9ZunGaXKG0N4hB8V1 ilcXP+1wCfXsuuUa/2R1cxY4oobsOtf+s6rIVnAjesDWh9ovywMBJ581gRYCIqQT o5urWzLtWUly+svQ5y7UYbb7uhXoPw== =+lbj -----END PGP SIGNATURE----- --lrZ03NoBR/3+SXJZ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190727055121.GA99138>