Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Jul 2019 14:19:30 +0400
From:      Gleb Popov <arrowd@freebsd.org>
To:        Tobias Kortkamp <tobik@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:  <CALH631ntL8XYkYreYUD609xetNaGYdHO3g3Yw3c2SL-xWk346g@mail.gmail.com>
In-Reply-To: <20190727055121.GA99138@urd.tobik.me>
References:  <201907261652.x6QGqoxC018196@repo.freebsd.org> <20190727055121.GA99138@urd.tobik.me>

next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Jul 27, 2019 at 9:51 AM Tobias Kortkamp <tobik@freebsd.org> wrote:

> 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
> >
> > Log:
> >   Add support for USES= cabal:hpack and document this option.
> >
> > Modified:
> >   head/Mk/Uses/cabal.mk
> >
> > Modified: head/Mk/Uses/cabal.mk
> >
> ==============================================================================
> > --- 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=cabal
> > +# Feature:   cabal
> > +# Usage:     USES=cabal or USES=cabal: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=    yes
> >
> > -.if !empty(cabal_ARGS)
> > -IGNORE=              Incorrect 'USES= cabal:${cabal_ARGS}' cabal takes
> no arguments
> > -.endif
> > -
>
> Nothing checks USES=cabal args now and it accepts any garbage
> arguments like USES=cabal:asdfasd.  Please put back some check for
> invalid arguments.
>

Does  https://svnweb.freebsd.org/changeset/ports/507506 look good for you?


> Index: Mk/Uses/cabal.mk
> ===================================================================
> --- 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=    yes
>
> +.if !empty(cabal_ARGS:Nhpack)
> +IGNORE=        USES=cabal has invalid arguments: ${cabal_ARGS:Nhpack}
> +.endif
> +
>  PKGNAMEPREFIX?=        hs-
>
>  EXECUTABLES?=  ${PORTNAME}
>
>
>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CALH631ntL8XYkYreYUD609xetNaGYdHO3g3Yw3c2SL-xWk346g>