diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2018-11-17 18:08:10 +0000 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2018-11-17 18:08:10 +0000 |
| commit | 9bca322f57d5368afde336e8b3698b53ce3c2321 (patch) | |
| tree | cbec435aee3c912ca59cfe8146d2a5ccf4152a7a /cad/openvsp | |
| parent | ddc54543abe6d1d7ad1ef79d14187febeb49fba6 (diff) | |
| download | ports-9bca322f57d5368afde336e8b3698b53ce3c2321.tar.gz ports-9bca322f57d5368afde336e8b3698b53ce3c2321.zip | |
cad/openvsp: Unbreak port
Port was broken after last compilers updates in 11 and 12.
Clang is now able to compile the port but we need to patch as_callfunc_x86.cpp
unconditionally, otherwise clang complains (or dies, depending on the version)
with:
this directive must appear between .cfi_startproc and .cfi_endproc directives
Also use localbase to simplify flags handling.
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=485187
Diffstat (limited to 'cad/openvsp')
| -rw-r--r-- | cad/openvsp/Makefile | 30 | ||||
| -rw-r--r-- | cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp (renamed from cad/openvsp/files/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp) | 0 |
2 files changed, 4 insertions, 26 deletions
diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 367131c4d221..2ac23d22f93e 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -30,22 +30,15 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs -CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject -CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} - -USES= cmake:outsource,noninja jpeg +USES= compiler:c++11-lang cmake:outsource,noninja localbase\ + gl gnome jpeg USE_GITHUB= yes GH_PROJECT= OpenVSP GH_ACCOUNT= ${GH_PROJECT} -# On FreeBSD < 11 libc++ lacks support for sized delete operators. -# GCC dropped the builtin version of these operators in 6+ by -# defaulting to gnu++14. Force c++11 instead. -# For a more detailed discussion see: -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484 -USE_CXXSTD= gnu++11 - +CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject +CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CODEELI:BOOLEAN=no \ @@ -60,24 +53,9 @@ USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \ USE_GL= gl glu USE_GNOME= libxml2 -CFLAGS+= -I${LOCALBASE}/include/openNURBS .include <bsd.port.options.mk> -# In 12 gcc can not compile the port so switch to clang 5.0.0 in base. -# But wait! It crashes while compiling so apply a patch to avoid weird asm code -# that makes clang die -# For details see: -# https://lists.freebsd.org/pipermail/freebsd-hackers/2017-August/051352.html - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 -USES+= compiler:c++11-lib -EXTRA_PATCHES= ${FILESDIR}/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp -CFLAGS+= -I${LOCALBASE}/include -.else -USES+= compiler:gcc-c++11-lib -.endif - BUILD_PREFIX= OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-${DISTVERSION}-FreeBSD do-install: diff --git a/cad/openvsp/files/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp b/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp index f3d8fb4a01f6..f3d8fb4a01f6 100644 --- a/cad/openvsp/files/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp +++ b/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp |