From 85514ee3067139c907f2fad3c8d893b47c690627 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 17 Oct 2018 08:35:55 +0000 Subject: [PATCH] Resolve file collision with py-six by removing the copy of Six shipped with LLVM and add a build depends on py-six. From Brad (maintainer) --- devel/llvm/Makefile | 7 ++++--- devel/llvm/pkg/PLIST-python | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile index 7dab02c2047..ed5dfd8cbdd 100644 --- a/devel/llvm/Makefile +++ b/devel/llvm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.188 2018/10/06 15:27:10 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.189 2018/10/17 08:35:55 ajacoutot Exp $ # XXX: Remember to bump MODCLANG_VERSION in lang/clang/clang.port.mk when # updating this port. @@ -20,7 +20,7 @@ PKGSPEC-main = llvm-=${LLVM_V} PKGNAME-main = llvm-${LLVM_V} PKGNAME-python = py-llvm-${LLVM_V} REVISION-main = 8 -REVISION-python = 0 +REVISION-python = 1 CATEGORIES = devel DISTFILES = llvm-${LLVM_V}.src${EXTRACT_SUFX} \ cfe-${LLVM_V}.src${EXTRACT_SUFX} \ @@ -58,7 +58,8 @@ RUN_DEPENDS += devel/gtest # clang python module loads libclang.so dynamically with cdll.LoadLibrary() WANTLIB-python = clang LIB_DEPENDS-llvm = ${BUILD_PKGPATH},-main -RUN_DEPENDS-python = ${MODPY_RUN_DEPENDS} +RUN_DEPENDS-python = ${MODPY_RUN_DEPENDS} \ + devel/py-six LIB_DEPENDS-python = ${BUILD_PKGPATH},-main SEPARATE_BUILD = Yes diff --git a/devel/llvm/pkg/PLIST-python b/devel/llvm/pkg/PLIST-python index e3b7e7c38e9..2763d22f6ef 100644 --- a/devel/llvm/pkg/PLIST-python +++ b/devel/llvm/pkg/PLIST-python @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-python,v 1.2 2018/10/06 15:27:10 ajacoutot Exp $ +@comment $OpenBSD: PLIST-python,v 1.3 2018/10/17 08:35:56 ajacoutot Exp $ lib/python${MODPY_VERSION}/site-packages/clang/ lib/python${MODPY_VERSION}/site-packages/clang/__init__.py lib/python${MODPY_VERSION}/site-packages/clang/__init__.pyc @@ -27,4 +27,4 @@ lib/python${MODPY_VERSION}/site-packages/lldb/runtime/__init__.py lib/python${MODPY_VERSION}/site-packages/lldb/utils/ lib/python${MODPY_VERSION}/site-packages/lldb/utils/__init__.py lib/python${MODPY_VERSION}/site-packages/lldb/utils/symbolication.py -lib/python${MODPY_VERSION}/site-packages/six.py +@comment lib/python${MODPY_VERSION}/site-packages/six.py