[ports-gcc] Unbreak x11/kde4/marble

6 views
Skip to first unread message

Charlene Wendling

unread,
Mar 14, 2019, 9:32:27 AM3/14/19
to po...@openbsd.org, KDE porting team
Hi ports,

> http://build-failures.rhaalovely.net/powerpc/2019-02-04/x11/kde4/marble.log

Not much to say here, it's yet another case where it just
needs -std=c++11.

It builds [1] and runs fine [2] once provided.

Any comment?


Charlène.


[1] http://0x0.st/zXjz.txt
[2] https://bsd.network/@julianaito/101749119665471201


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/marble/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 1 Jul 2018 18:33:38 -0000 1.19
+++ Makefile 14 Mar 2019 13:18:43 -0000
@@ -2,7 +2,7 @@

COMMENT = world maps
DISTNAME = marble-${MODKDE4_VERSION}
-REVISION = 6
+REVISION = 7

SHARED_LIBS = marblewidget 52.0 # 0.12
SHARED_LIBS += astro 1.0 # 0.17
@@ -68,3 +68,10 @@ post-install:
done

.include <bsd.port.mk>
+
+# fix error: #error Must have C++11 or newer.
+# XXX this should be retried once moving to ports-gcc>=8
+.if ${CHOSEN_COMPILER} == "ports-gcc"
+CONFIGURE_ENV += CXXFLAGS="${CXXFLAGS} -std=c++11"
+.endif
+


Stuart Henderson

unread,
Mar 14, 2019, 10:37:05 AM3/14/19
to Charlene Wendling, po...@openbsd.org, KDE porting team
On 2019/03/14 14:32, Charlene Wendling wrote:
> Hi ports,
>
> > http://build-failures.rhaalovely.net/powerpc/2019-02-04/x11/kde4/marble.log
>
> Not much to say here, it's yet another case where it just
> needs -std=c++11.
>
> It builds [1] and runs fine [2] once provided.
>
> Any comment?

I'm not the biggest fan of adding things after the bsd.port.mk include,
but it makes sense for now - OK.

Maybe worth keeping a list of ports with forced -std=c++11 that we can
remove after switching?

Charlene Wendling

unread,
Mar 14, 2019, 11:49:07 AM3/14/19
to Stuart Henderson, po...@openbsd.org, KDE porting team
On Thu, 14 Mar 2019 14:37:02 +0000
Stuart Henderson <s...@spacehopper.org> wrote:

> On 2019/03/14 14:32, Charlene Wendling wrote:
> > Hi ports,
> >
> > > http://build-failures.rhaalovely.net/powerpc/2019-02-04/x11/kde4/marble.log
> >
> > Not much to say here, it's yet another case where it just
> > needs -std=c++11.
> >
> > It builds [1] and runs fine [2] once provided.
> >
> > Any comment?
>
> I'm not the biggest fan of adding things after the bsd.port.mk
> include, but it makes sense for now - OK.

Once we'll use ports-gcc-8, some ports may need the opposite, i mean
using -std=gnu++98, like x11/rxvt-unicode, sadly. There should be
less of those though.

> Maybe worth keeping a list of ports with forced -std=c++11 that we can
> remove after switching?

I "tagged" my changes with "ports-gcc>=8". If you have
the_silver_searcher installed, they can be quickly found by issuing
this:

$ cd /usr/ports/; ag --ignore 'pobj/*' --silent -flQ 'ports-gcc>=8'

graphics/openscenegraph/Makefile
multimedia/mlt/Makefile
print/texlive/base/patches/patch-texk_dvisvgm_dvisvgm-src_libs_brotli_common_platform_h
print/texlive/base/patches/patch-texk_dvisvgm_dvisvgm-src_libs_brotli_include_brotli_port_h
print/texlive/base/patches/patch-texk_dvisvgm_dvisvgm-src_libs_brotli_enc_fast_log_h

In any case it's supposed to be the last one, unless landry pings me
about now "unlocked" ports in his current bulk.

Charlène.
Reply all
Reply to author
Forward
0 new messages