svn commit: r526189 - in head/devel/llvm10: . files/ppc64-elfv2

[Piotr Kubaj]

Author: pkubaj
Date: Sat Feb 15 00:07:34 2020
New Revision: 526189
URL: https://svnweb.freebsd.org/changeset/ports/526189

Log:
  devel/llvm10: remove ELFv2 option to fix patch target
  
  ELFv2 patches are now upstreamed and having them in ports actually breaks patch target:
  =======================<phase: patch          >============================
  ===>  Patching for llvm10-10.0.0.r1
  ===>  Applying extra patch patches for llvm10-10.0.0.r1
  ===>  Applying extra patch patches for llvm10-10.0.0.r1
  1 out of 1 hunks failed--saving rejects to tools/clang/lib/Basic/Targets/PPC.h.rej
  => extra patch patch patch-tools_clang_lib_Basic_Targets_PPC.h failed to apply cleanly.
  => Patch(es)  patch-lib_Target_PowerPC_PPCTargetMachine.cpp applied cleanly.
  
  Approved by:	portmgr (fix build blanket)

Deleted:
  head/devel/llvm10/files/ppc64-elfv2/
Modified:
  head/devel/llvm10/Makefile

Modified: head/devel/llvm10/Makefile
==============================================================================
--- head/devel/llvm10/Makefile	Sat Feb 15 00:05:08 2020	(r526188)
+++ head/devel/llvm10/Makefile	Sat Feb 15 00:07:34 2020	(r526189)
@@ -64,14 +64,14 @@ CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
-OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS ELFV2 EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
+OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFINE_powerpc64=	OPENMP
 OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
-OPTIONS_DEFAULT_powerpc64=	${PPC_ABI:tu:MELFV2} OPENMP
+OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_SINGLE=		BACKENDS
 OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
 OPTIONS_SUB=	yes
@@ -111,9 +111,6 @@ DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 			-DLLVM_BUILD_DOCS=ON
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
-ELFV2_DESC=		[PowerPC64] Use OpenPOWER ELF ABI v2 by default
-ELFV2_EXTRA_PATCHES=	${PATCHDIR}/ppc64-elfv2
-ELFV2_IMPLIES=		CLANG
 EXTRAS_DESC=		Extra clang tools
 EXTRAS_EXTRA_PATCHES=	${PATCHDIR}/extras
 EXTRAS_IMPLIES=		CLANG