mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

graphics/cloudcompare: fix build on powerpc64 elfv2

Browse Source 
xmmintrin.h is unnecesary and makes CXXFLAGS_powerpc64 also unnecessary (tested on amd64 as well), while clang on ppc64 elfv2 needs mm_malloc.h.

PR:		242530
Approved by:	neel@neelc.org (maintainer)
This commit is contained in:
Piotr Kubaj 2019-12-24 01:55:19 +00:00
parent 3626473e5f
commit 6df2c7356c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=520769
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/cloudcompare/Makefile
View File

@ -68,8 +68,6 @@ PLUGINS_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libvtkDomainsChemistry-6.2.so:math/vtk6
PLUGINS_IMPLIES= SHAPELIB
CXXFLAGS_powerpc64= -DNO_WARN_X86_INTRINSICS -mvsx
post-patch:
@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},1' ${WRKSRC}/snap/gui/ccViewer.desktop ${WRKSRC}/snap/gui/cloudcompare.desktop

12
graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h
View File

@ -1,6 +1,6 @@
--- ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h.orig 2019-01-07 13:59:17.670295000 -0500
+++ ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h 2019-01-07 13:59:38.242600000 -0500
@@ -1,7 +1,7 @@
--- plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h.orig 2019-06-13 21:16:40 UTC
+++ plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h
@@ -1,12 +1,12 @@
#ifndef MiscLib__ALIGNEDALLOCATOR_HEADER__
#define MiscLib__ALIGNEDALLOCATOR_HEADER__
#include <memory>
@ -9,3 +9,9 @@
#include <malloc.h>
#else
#include <stdlib.h>
#endif
-#include <xmmintrin.h>
+#include <mm_malloc.h>
#include <limits>
#ifdef max
#undef max