On Mon, Apr 29 2019, Jeremie Courreges-Anglas <j...@openbsd.org> wrote:
> On Sat, Apr 27 2019, Brad Smith <b...@comstyle.com> wrote:
>> Now that the GCC compiler has been updated and we now have a C++11 compliant
>> libstdc++ the workaround for lldb can be removed.
>
> Please state what you have tested and what you haven't tested, on which
> architectures.
>
> Here's an updated diff after the recent commits in this port.
Less bogus diff that builds on amd64, sparc64 bulk build ongoing.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.221
diff -u -p -r1.221 Makefile
--- Makefile 29 Apr 2019 12:37:52 -0000 1.221
+++ Makefile 29 Apr 2019 14:48:36 -0000
@@ -48,10 +48,9 @@ DISTFILES = llvm-${LLVM_V}.src${EXTRACT_
clang-tools-extra-${LLVM_V}.src${EXTRACT_SUFX}
MULTI_PACKAGES = -main -python -lldb -extras
-PSEUDO_FLAVORS = no_lldb no_extras
+PSEUDO_FLAVORS = no_extras
# XXX enabling -extras changes the content of the -main subpackage
FLAVOR ?= no_extras
-NOT_FOR_ARCHS-lldb = ${GCC4_ARCHS}
COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
@@ -140,9 +139,6 @@ post-extract:
pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/lib/Driver/ToolChains/OpenBSD.cpp
-@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
-.if !${BUILD_PACKAGES:M-lldb}
- rm -r ${WRKSRC}/tools/lldb
-.endif
.if !${BUILD_PACKAGES:M-extras}
rm -r ${WRKSRC}/tools/clang/tools/extra
.endif
@@ -165,9 +161,7 @@ post-install:
# lit and FileCheck are not installed
@rm ${PREFIX}/man/man1/lit.1
@rm ${PREFIX}/man/man1/FileCheck.1
-.if ${BUILD_PACKAGES:M-lldb}
ln -fs ${TRUEPREFIX}/lib/liblldb.so.${LIBlldb_VERSION} \
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/lldb/_lldb.so
-.endif
.include <bsd.port.mk>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
