svn commit: r350329 - in head/devel/bisoncpp: . files

[Sunpoet Po-Chuan Hsieh]

On Mon, Apr 7, 2014 at 7:49 AM, Gerald Pfeifer <gerald at pfeifer.com> wrote:
> On Sun, 6 Apr 2014, Sunpoet Po-Chuan Hsieh wrote:
>> Log:
>>   - Update to 4.08.00
>>   - Pass maintainership to submitter
>>   - While I'm here, relax USE_GCC to yes
>>
>>   Changes:    http://sourceforge.net/projects/bisoncpp/files/bisonc%2B%2B/4.08.00/README/view
>>               http://sourceforge.net/projects/bisoncpp/files/bisonc%2B%2B/4.07.00/README/view
>>               http://sourceforge.net/projects/bisoncpp/files/bisonc%2B%2B/4.06.00/README/view
>>   PR:         188267
>>   Submitted by:       Muhammad Moinur Rahman <5u623l20 at gmail.com>
>
>> Modified: head/devel/bisoncpp/Makefile
>> ==============================================================================
>> -USE_GCC=     4.7
>> +USE_GCC=     yes
>
> This change is not correct.
>
> Check out the following lines later in this Makefile:
>
>         @${REINPLACE_CMD} 's|"g++|"g++47|' \
>                 ${WRKSRC}/INSTALL.im \
>                 ${WRKSRC}/scanner/driver/build \
>                 ${WRKSRC}/parser/driver/build
>         @${REINPLACE_CMD} 's|"gcc|"gcc47|' \
>                 ${WRKSRC}/icmake/special
>
> This works by chance today since USE_GCC=yes defaults to GCC 4.7.
>
> It will break for anyone installing (only) lang/gcc48 or when we
> switch to GCC 4.8 as default.
>
> Can you please fix this?
>
> Gerald
>
> PS: If ${CC} is set at this point, that would be the best option
> instead of hard-coding things.

Thank you, Gerald. I should use CC and CXX here. Is it OK?

Index: Makefile
===================================================================
--- Makefile    (revision 350329)
+++ Makefile    (working copy)
@@ -47,11 +47,11 @@
        @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g; \
                s|%%PORTVERSION%%|${PORTVERSION}|g' \
                ${WRKSRC}/INSTALL.im
-       @${REINPLACE_CMD} 's|"g++|"g++47|' \
+       @${REINPLACE_CMD} 's|"g++|"${CXX}|' \
                ${WRKSRC}/INSTALL.im \
                ${WRKSRC}/scanner/driver/build \
                ${WRKSRC}/parser/driver/build
-       @${REINPLACE_CMD} 's|"gcc|"gcc47|' \
+       @${REINPLACE_CMD} 's|"gcc|"${CC}|' \
                ${WRKSRC}/icmake/special
        @${REINPLACE_CMD} 's|"cp -d |"cp -Pp | ; \
                s|"cp -r |"cp -R | ; \

Regards,
sunpoet