git: f3743efb0f84 - main - graphics/osgearth: Unbreak build on arm64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 24 Jul 2023 19:19:39 UTC
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3743efb0f84b0f2a490329bb833fef60ec1216e commit f3743efb0f84b0f2a490329bb833fef60ec1216e Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2023-07-24 19:09:46 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2023-07-24 19:19:08 +0000 graphics/osgearth: Unbreak build on arm64 The build failed on arm64 for including llvm intrinsics headers for x86 architectures. The extra patch for i386 already modified the build not to use these intrinsics, so it solves the issue for arm64 as well. It is still needed on i386 because intrinsics requiring SSE are used. Therefore, rename the patch file to better describe the purpose and use it for any architecture except amd64 and powerpc64, the latter assuming the flags used for powerpc64 still work, which I cannot test myself. The result on architectures that built fine before is unchanged, therefore no revision bump is required. Reported by: pkg-fallout --- graphics/osgearth/Makefile | 7 +++---- .../osgearth/files/{extra-patch-i386 => extra-patch-no-ia32-sse} | 0 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index f78f6fa99b93..50643548f636 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -45,11 +45,10 @@ post-extract: CXXFLAGS+= -DNO_WARN_X86_INTRINSICS -maltivec -mvsx USES+= compiler:gcc-c++11-lib .else +. if ${ARCH} != amd64 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-no-ia32-sse +. endif USES+= compiler:c++11-lang .endif -.if ${ARCH} == i386 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-i386 -.endif - .include <bsd.port.mk> diff --git a/graphics/osgearth/files/extra-patch-i386 b/graphics/osgearth/files/extra-patch-no-ia32-sse similarity index 100% rename from graphics/osgearth/files/extra-patch-i386 rename to graphics/osgearth/files/extra-patch-no-ia32-sse