Re: [macports-ports] branch master updated: qmake 1.0 PG: use the correct linking compiler and flags.

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: [macports-ports] branch master updated: qmake 1.0 PG: use the correct linking compiler and flags.

Ryan Schmidt-24

> On May 24, 2017, at 09:25, Michael Dickens <[hidden email]> wrote:
>
> Michael Dickens (michaelld) pushed a commit to branch master
> in repository macports-ports.
>
>
> https://github.com/macports/macports-ports/commit/bf6ff46c8e33a31bf06096ff15d28450159f9f18
>
> The following commit(s) were added to refs/heads/master by this push:
>
>      new bf6ff46  qmake 1.0 PG: use the correct linking compiler and flags.
>
> bf6ff46 is described below
>
>
> commit bf6ff46c8e33a31bf06096ff15d28450159f9f18
>
> Author: Michael Dickens <[hidden email]>
> AuthorDate: Wed May 24 10:25:28 2017 -0400
>
>
>     qmake 1.0 PG: use the correct linking compiler and flags.
>
> ---
>  _resources/port1.0/group/qmake-1.0.tcl | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
>
> diff --git a/_resources/port1.0/group/qmake-1.0.tcl b/_resources/port1.0/group/qmake-1.0.tcl
>
> index a1fb102..bc16061 100644
>
> --- a/_resources/port1.0/group/qmake-1.0.tcl
>
> +++ b/_resources/port1.0/group/qmake-1.0.tcl
>
> @@ -44,7 +44,12 @@ pre-configure {
>
>                                      "QMAKE_CXX=${configure.cxx}" \
>                                      "QMAKE_OBJC=${configure.objc}" \
>                                      "QMAKE_CFLAGS=\"${configure.cflags} [get_canonical_archflags cc]\"" \
>
> -                                    "QMAKE_CXXFLAGS=\"${configure.cxxflags} [get_canonical_archflags cxx]\""
>
> +                                    "QMAKE_CXXFLAGS=\"${configure.cxxflags} [get_canonical_archflags cxx]\"" \
>
> +                                    "QMAKE_LFLAGS=\"${configure.ldflags}\"" \
>
> +                                "QMAKE_LINK_C=${configure.cc}" \
>
> +                                "QMAKE_LINK_C_SHLIB=${configure.cc}" \
>
> +                                "QMAKE_LINK=${configure.cxx}" \
>
> +                                "QMAKE_LINK_SHLIB=${configure.cxx}"

I've never understood why there are so many quotation marks going on in this portgroup.

Also, the whitespace doesn't line up, because some of your lines use tabs instead of spaces.