Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat May 6 03:45:32 2017 +0200
Changeset: 6f9a20be0674f19593ec411541d941bee0f040a7
Modified Files:
clang-git/buildlink3.mk
clang-netbsd/Makefile
clang-netbsd/Makefile.common
lldb-netbsd/Makefile
llvm-git/buildlink3.mk
llvm-netbsd/Makefile
Log Message:
llvm-*: clang-*: lldb-*: Reduce diff between similar packages
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6f9a20be0674f19593ec411541d941bee0f040a7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
clang-git/buildlink3.mk | 2 +-
clang-netbsd/Makefile | 5 -----
clang-netbsd/Makefile.common | 8 +++++---
lldb-netbsd/Makefile | 40 +++++++++++++++++++++++++++++-----------
llvm-git/buildlink3.mk | 2 +-
llvm-netbsd/Makefile | 37 ++++++++++++++++++++++++++++---------
6 files changed, 64 insertions(+), 30 deletions(-)
diffs:
diff --git a/clang-git/buildlink3.mk b/clang-git/buildlink3.mk
index 13e293944c..7f05203d2b 100644
--- a/clang-git/buildlink3.mk
+++ b/clang-git/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+= clang
.if !defined(CLANG_BUILDLINK3_MK)
CLANG_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.clang+= clang>=3.9.0
+BUILDLINK_API_DEPENDS.clang+= clang>=5.0.0
BUILDLINK_PKGSRCDIR.clang?= ../../wip/clang-git
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/clang-netbsd/Makefile b/clang-netbsd/Makefile
index 4d383b6bc9..78d38ca973 100644
--- a/clang-netbsd/Makefile
+++ b/clang-netbsd/Makefile
@@ -9,9 +9,4 @@ CMAKE_ARGS+= -DCLANG_ENABLE_STATIC_ANALYZER=OFF
# We don't want to add a python runtime dependency for that.
CHECK_INTERPRETER_SKIP+= share/clang/*
-.PHONY: install-clang-cpp
-post-install: install-clang-cpp
-install-clang-cpp:
- ${LN} -fs clang ${DESTDIR}${PREFIX}/bin/clang-cpp
-
.include "../../wip/clang-netbsd/Makefile.common"
diff --git a/clang-netbsd/Makefile.common b/clang-netbsd/Makefile.common
index ff9021d198..06eec48acb 100644
--- a/clang-netbsd/Makefile.common
+++ b/clang-netbsd/Makefile.common
@@ -19,17 +19,19 @@ WRKSRC= ${WRKDIR}/clang
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=gcc
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=g++
+CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
# XXX can't disable static-analyzer without also disabling ARCMT
CMAKE_ARGS+= -DCLANG_ENABLE_ARCMT=OFF
+CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
+
REPLACE_PERL+= test/make_test_dirs.pl
REPLACE_PERL+= tools/scan-build/bin/scan-build
REPLACE_PERL+= tools/scan-build/libexec/c++-analyzer
diff --git a/lldb-netbsd/Makefile b/lldb-netbsd/Makefile
index e461145d64..b78ac7d06e 100644
--- a/lldb-netbsd/Makefile
+++ b/lldb-netbsd/Makefile
@@ -18,15 +18,18 @@ WRKSRC= ${WRKDIR}/${PKGBASE}
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
PY_PATCHPLIST= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # compilation failure in 3.8.1 (3.8.0 worked)
+
CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_ARGS+= -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON
CMAKE_ARGS+= -DLLDB_USE_SYSTEM_SIX:BOOL=TRUE
CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
@@ -55,21 +58,36 @@ TEST_TARGET= check-lldb
#TEST_TARGET= check-lldb-expr # unknown
TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+= posix
+.if ${OPSYS} != "Darwin"
+PLIST.posix= yes
+.endif
+
+.if ${OPSYS} == "NetBSD"
+. if exists(/usr/include/panel.h)
+CMAKE_ARGS+= -DLLDB_DISABLE_CURSES:BOOL=FALSE
+. else
+CMAKE_ARGS+= -DLLDB_DISABLE_CURSES:BOOL=TRUE
+. endif
+.endif
+
post-extract:
${RUN} mkdir -p ${WRKDIR}/build
#.include "../../devel/googletest/buildlink3.mk" # check-lldb-unit
-.include "../../textproc/libxml2/buildlink3.mk"
-DEPENDS+= llvm-${PKGVERSION_NOREV}{,nb*}:../../wip/llvm-netbsd
-.include "../../wip/llvm-netbsd/buildlink3.mk"
-DEPENDS+= clang-${PKGVERSION_NOREV}{,nb*}:../../wip/clang-netbsd
-.include "../../wip/clang-netbsd/buildlink3.mk"
-.include "../../wip/mk/svn-package.mk"
-PYTHON_VERSIONS_ACCEPTED= 27
+.include "../../devel/libatomic_ops/buildlink3.mk"
+.include "../../devel/swig/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../lang/python/pyversion.mk"
+DEPENDS+= clang-${PKGVERSION_NOREV}{,nb*}:../../lang/clang-netbsd
+.include "../../wip/clang-netbsd/buildlink3.mk"
+DEPENDS+= llvm-${PKGVERSION_NOREV}{,nb*}:../../lang/llvm-netbsd
+.include "../../wip/llvm-netbsd/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/tool.mk"
-.include "../../devel/swig/buildlink3.mk"
+.include "../../lang/python/extension.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/llvm-git/buildlink3.mk b/llvm-git/buildlink3.mk
index d9550c48a7..f0be39f7a5 100644
--- a/llvm-git/buildlink3.mk
+++ b/llvm-git/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+= llvm
.if !defined(LLVM_BUILDLINK3_MK)
LLVM_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.llvm+= llvm>=3.9.0
+BUILDLINK_API_DEPENDS.llvm+= llvm>=5.0.0
BUILDLINK_PKGSRCDIR.llvm?= ../../wip/llvm-git
LLVM_CONFIG_PATH?= ${BUILDLINK_PREFIX.llvm}/bin/llvm-config
diff --git a/llvm-netbsd/Makefile b/llvm-netbsd/Makefile
index 5e8aabf8a6..6f1c8f5977 100644
--- a/llvm-netbsd/Makefile
+++ b/llvm-netbsd/Makefile
@@ -1,4 +1,13 @@
# $NetBSD: Makefile.common,v 1.7 2015/07/20 05:49:53 adam Exp $
+#
+# when updating this, please also update:
+# devel/include-what-you-use
+# devel/lldb
+# devel/polly
+# lang/clang
+# lang/clang-static-analyzer
+# lang/libLLVM
+# lang/libunwind
PKGNAME= llvm-5.0.0
CATEGORIES= lang devel
@@ -12,7 +21,7 @@ HOMEPAGE= http://llvm.org/
COMMENT= Low Level Virtual Machine compiler infrastructure
LICENSE= modified-bsd
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
PYTHON_FOR_BUILD_ONLY= yes
@@ -24,13 +33,19 @@ CMAKE_ARG_PATH= ${WRKSRC}
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON
CMAKE_ARGS+= -DLLVM_INSTALL_UTILS=ON
+CMAKE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON
+
+CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
# XXX perl is not added as a tool as it does not seem to be required
REPLACE_PERL+= utils/*.pl
REPLACE_PERL+= utils/codegen-diff
+REPLACE_PERL+= utils/llvm-native-gxx
REPLACE_PYTHON+= *.py
REPLACE_PYTHON+= */*.py
@@ -49,23 +64,27 @@ REPLACE_PYTHON+= utils/llvm-lit/llvm-lit.in
TEST_TARGET= check
TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
+# It may be that the Solaris linker is more strict here and they can be removed on
+# all platforms. Change this to a patch if verified.
+SUBST_CLASSES.SunOS+= lto
+SUBST_STAGE.lto= pre-configure
+SUBST_FILES.lto= tools/lto/lto.exports
+SUBST_SED.lto= -e '/^LLVM/d'
+
.include "../../mk/bsd.prefs.mk"
+PLIST_VARS+= notdylib
.if ${_OPSYS_SHLIB_TYPE} == "dylib"
SOEXT= dylib
.else
SOEXT= so
+PLIST.notdylib= yes
.endif
PLIST_SUBST+= SOEXT=${SOEXT}
-.if ${OPSYS} == "Darwin"
-.PHONY: fix-darwin-install-name
-post-install: fix-darwin-install-name
-fix-darwin-install-name:
-. for lib in BugpointPasses LLVMHello libLTO
- install_name_tool -id ${PREFIX}/lib/${lib}.${SOEXT} \
- ${DESTDIR}${PREFIX}/lib/${lib}.${SOEXT}
-. endfor
+# needs std::atomic with 64-bit CAS
+.if ${MACHINE_ARCH} == "i386"
+CXXFLAGS+= -march=i586
.endif
.include "options.mk"