pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openscad: Fix build with cgal 6.0.x+



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Tue Feb 18 13:14:34 2025 +1100
Changeset:	4c373314ab7186fe4dd49fa8d0e483b16e69eb50

Modified Files:
	openscad/Makefile

Log Message:
openscad: Fix build with cgal 6.0.x+

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4c373314ab7186fe4dd49fa8d0e483b16e69eb50

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openscad/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diffs:
diff --git a/openscad/Makefile b/openscad/Makefile
index 0b993ca380..268a454b80 100644
--- a/openscad/Makefile
+++ b/openscad/Makefile
@@ -12,9 +12,10 @@ HOMEPAGE=	https://www.openscad.org/
 COMMENT=	OpenSCAD - The Programmers Solid 3D CAD Modeller
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	bison gettext pkg-config itstool
-USE_LIBTOOL=	yes
+USE_LANGUAGES=		c c++
+USE_CXX_FEATURES=	c++17
+USE_TOOLS+=		bison gettext pkg-config itstool
+USE_LIBTOOL=		yes
 
 WRKSRC=		${WRKDIR}/${PKGBASE}-${DISTNAME}
 
@@ -24,10 +25,12 @@ CHECK_PORTABILITY_SKIP+=	tests/compare-bitmaps.sh
 
 MAKE_ENV+=	INSTALL_ROOT=${DESTDIR}
 
+# CGAL 6.0.x+ needs c++17
+BUILDLINK_TRANSFORM+=	opt:-std=c++1y:-std=c++17
+
 do-configure:
 	cd ${WRKSRC} && ${QTDIR}/bin/qmake \
-	    PREFIX=${PREFIX} -after QMAKE_YACC=bison QMAKE_LEX=flex \
-	    QMAKE_CXXFLAGS+=-std=c++0x
+	    PREFIX=${PREFIX} -after QMAKE_YACC=bison QMAKE_LEX=flex
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"


Home | Main Index | Thread Index | Old Index