Date: Fri, 27 Apr 2018 21:06:31 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Michael Reifenberger <mr@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r468281 - in head/cad/openscad-devel: . files Message-ID: <o9i4-zcy0-wny@FreeBSD.org> In-Reply-To: <201804251629.w3PGTA54028076@repo.freebsd.org> (Michael Reifenberger's message of "Wed, 25 Apr 2018 16:29:10 %2B0000 (UTC)") References: <201804251629.w3PGTA54028076@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Michael Reifenberger <mr@FreeBSD.org> writes:
> @@ -14,6 +14,8 @@ COMMENT= Programmer's solid 3D CAD modeller
> LICENSE= GPLv2+
> LICENSE_FILE= ${WRKSRC}/COPYING
>
> +BROKEN_FreeBSD_10= Missing __cxa_thread_atexit
FreeBSD 10.4 does have __cxa_thread_atexit. 10.3 reaches EOL on 2018-04-30.
https://svnweb.freebsd.org/changeset/base/304527
https://www.freebsd.org/security/#sup
> QMAKE_ARGS+= VERSION=${PORTVERSION} \
> + EXPERIMENTAL=yes \
[...]
> -@@ -106,4 +106,8 @@
> +--- openscad.pro.orig 2018-04-19 22:08:08 UTC
> ++++ openscad.pro
> +@@ -1,3 +1,4 @@
> ++CONFIG+=experimental
Why not pass as QMAKE_ARGS+=CONFIG+="experimental" via port's Makefile ?
10.4 i386 build log: https://ptpb.pw/QemG
--- cad/openscad-devel/Makefile~
+++ cad/openscad-devel/Makefile
@@ -10,12 +10,11 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= mr@FreeBSD.org
COMMENT= Programmer's solid 3D CAD modeller
+#' <-- for syntax highlighting
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN_FreeBSD_10= Missing __cxa_thread_atexit
-
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \
${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
LIB_DEPENDS= libgmp.so:math/gmp \
@@ -41,7 +40,7 @@ USE_QT4= corelib gui opengl moc_build uic_build rcc_build
PLIST_SUB= PORTVERSION=${PORTVERSION}
QMAKE_ENV= EIGENDIR=${LOCALBASE}/include/eigen3
QMAKE_ARGS+= VERSION=${PORTVERSION} \
- EXPERIMENTAL=yes \
+ CONFIG+="experimental" \
QMAKE_LEX=${LOCALBASE}/bin/flex \
QMAKE_YAC=${LOCALBASE}/bin/bison
@@ -49,4 +48,10 @@ post-patch:
@${REINPLACE_CMD} -e 's,share/man,man,' \
${WRKSRC}/openscad.pro
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003506
+BROKEN= no __cxa_thread_atexit() support in FreeBSD libc < 10.4
+.endif
+
.include <bsd.port.mk>
diff --git cad/openscad-devel/files/patch-openscad.pro cad/openscad-devel/files/patch-openscad.pro
index e261d4978ac7..f764f845f1fa 100644
--- cad/openscad-devel/files/patch-openscad.pro
+++ cad/openscad-devel/files/patch-openscad.pro
@@ -1,10 +1,5 @@
--- openscad.pro.orig 2018-04-19 22:08:08 UTC
+++ openscad.pro
-@@ -1,3 +1,4 @@
-+CONFIG+=experimental
- # Environment variables which can be set to specify library locations:
- # MPIRDIR
- # MPFRDIR
@@ -105,6 +106,10 @@ mingw* {
CONFIG += qt
QT += widgets concurrent
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?o9i4-zcy0-wny>