Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Sep 2020 00:57:13 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r549872 - head/graphics/vulkan-loader
Message-ID:  <202009240057.08O0vDtN055146@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Sep 24 00:57:13 2020
New Revision: 549872
URL: https://svnweb.freebsd.org/changeset/ports/549872

Log:
  graphics/vulkan-loader: unbreak on -CURRENT on i386 by using GCC
  
  Assertion failed: (Type == RT32_32), function getRelocType32, file llvm/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp, line 260.
  
  PR:		249527
  Reported by:	pkg-fallout

Modified:
  head/graphics/vulkan-loader/Makefile   (contents, props changed)

Modified: head/graphics/vulkan-loader/Makefile
==============================================================================
--- head/graphics/vulkan-loader/Makefile	Thu Sep 24 00:57:06 2020	(r549871)
+++ head/graphics/vulkan-loader/Makefile	Thu Sep 24 00:57:13 2020	(r549872)
@@ -15,7 +15,7 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
 
-USES=		cmake compiler:c++11-lib pkgconfig python:3.4+,build
+USES=		cmake compiler:${ARCH:Mi386:C/.+/gcc-/}c++11-lib pkgconfig python:3.4+,build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
@@ -41,17 +41,4 @@ XCB_LIB_DEPENDS=	libX11-xcb.so:x11/libX11 \
 WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 
-.include <bsd.port.pre.mk>
-
-# XXX Drop after FreeBSD 11.3/12.1 EOL
-.if ${ARCH} == i386 && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 100
-. if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} < 100
-LLVM_DEFAULT=	10
-. endif
-BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CC=		clang${LLVM_DEFAULT}
-CXX=		clang++${LLVM_DEFAULT}
-CPP=		clang-cpp${LLVM_DEFAULT}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009240057.08O0vDtN055146>