Date: Wed, 24 May 2017 22:14:14 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441623 - in head/devel/llvm40: . files Message-ID: <201705242214.v4OMEEwe049198@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Wed May 24 22:14:14 2017 New Revision: 441623 URL: https://svnweb.freebsd.org/changeset/ports/441623 Log: Adapt to ino64 changes.[0] Bump dependencies to allow python 3 support.[1] PR: 219222 [1] Submitted by: kib [0], Daniel Ylitalo <daniel@blodan.se> [1] Reviewed by: emaste [0] Differential Revision: https://reviews.freebsd.org/D10797 Added: head/devel/llvm40/files/compiler-rt-patch-canonical-syscalls (contents, props changed) head/devel/llvm40/files/compiler-rt-patch-ino64 (contents, props changed) Modified: head/devel/llvm40/Makefile head/devel/llvm40/pkg-plist Modified: head/devel/llvm40/Makefile ============================================================================== --- head/devel/llvm40/Makefile Wed May 24 22:09:03 2017 (r441622) +++ head/devel/llvm40/Makefile Wed May 24 22:14:14 2017 (r441623) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 4.0.1rc1 -PORTREVISION= 4 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -87,7 +87,7 @@ LIT_DESC= Install lit and FileCheck tes LIT_VARS= _USES_PYTHON=python LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} -LLDB_BUILD_DEPENDS= swig:devel/swig13 +LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 LLDB_DESC= Install lldb, the LLVM debugger LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb-patch-tools_lldb_source_Host_common_FileSpec.cpp @@ -320,10 +320,6 @@ LLDB_BUILD_DEPENDS+= \ ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 .endif -.if ${PORT_OPTIONS:MLLDB} && ${PYTHON_REL} >= 3000 -BROKEN= LLDB does not build with Python 3 -.endif - post-extract-CLANG-on: ${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang @@ -339,6 +335,10 @@ post-extract-LLDB-on: post-extract-OPENMP-on: ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp +post-patch-COMPILER_RT-on: + cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-canonical-syscalls + cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-ino64 + post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ -e 's|from lit|from lit${LLVM_SUFFIX}|' \ @@ -441,6 +441,8 @@ regression-test: ${BUILD_COOKIE} build-plist: ${RM} ${PLIST} ${PLIST}.tmp + ${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp + ${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp .for command in ${COMMANDS} ${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp .endfor @@ -456,7 +458,8 @@ build-plist: -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \ - -e 's|${LLVM_MAJOR:C/\.//}|%%LLVM_LIB_VER%%|' | \ + -e 's|${LLVM_MAJOR:C/\.//}|%%LLVM_LIB_VER%%|' \ + -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' | \ ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \ Added: head/devel/llvm40/files/compiler-rt-patch-canonical-syscalls ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm40/files/compiler-rt-patch-canonical-syscalls Wed May 24 22:14:14 2017 (r441623) @@ -0,0 +1,35 @@ +diff --git lib/sanitizer_common/sanitizer_linux.cc lib/sanitizer_common/sanitizer_linux.cc +index 7328a5c0ac1..4b59a39ee27 100644 +--- lib/sanitizer_common/sanitizer_linux.cc ++++ lib/sanitizer_common/sanitizer_linux.cc +@@ -223,7 +223,8 @@ static void kernel_stat_to_stat(struct kernel_stat *in, struct stat *out) { + + uptr internal_stat(const char *path, void *buf) { + #if SANITIZER_FREEBSD +- return internal_syscall(SYSCALL(stat), path, buf); ++ return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path, ++ (uptr)buf, 0); + #elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS + return internal_syscall(SYSCALL(newfstatat), AT_FDCWD, (uptr)path, + (uptr)buf, 0); +@@ -247,7 +248,8 @@ uptr internal_stat(const char *path, void *buf) { + + uptr internal_lstat(const char *path, void *buf) { + #if SANITIZER_FREEBSD +- return internal_syscall(SYSCALL(lstat), path, buf); ++ return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path, ++ (uptr)buf, AT_SYMLINK_NOFOLLOW); + #elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS + return internal_syscall(SYSCALL(newfstatat), AT_FDCWD, (uptr)path, + (uptr)buf, AT_SYMLINK_NOFOLLOW); +@@ -590,7 +592,9 @@ uptr internal_getppid() { + } + + uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count) { +-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS ++#if SANITIZER_FREEBSD ++ return internal_syscall(SYSCALL(getdirentries), fd, (uptr)dirp, count, NULL); ++#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS + return internal_syscall(SYSCALL(getdents64), fd, (uptr)dirp, count); + #else + return internal_syscall(SYSCALL(getdents), fd, (uptr)dirp, count); Added: head/devel/llvm40/files/compiler-rt-patch-ino64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm40/files/compiler-rt-patch-ino64 Wed May 24 22:14:14 2017 (r441623) @@ -0,0 +1,15 @@ +--- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig 2017-05-24 19:09:24.000000000 +0000 ++++ lib/sanitizer_common/sanitizer_platform_limits_posix.h 2017-05-24 20:12:47.183536000 +0000 +@@ -485,7 +485,12 @@ + }; + #elif SANITIZER_FREEBSD + struct __sanitizer_dirent { ++#if __FreeBSD_version < 1200031 + unsigned int d_fileno; ++#else ++ unsigned long long d_fileno; ++ unsigned long long d_off; ++#endif + unsigned short d_reclen; + // more fields that we don't care about + }; Modified: head/devel/llvm40/pkg-plist ============================================================================== --- head/devel/llvm40/pkg-plist Wed May 24 22:09:03 2017 (r441622) +++ head/devel/llvm40/pkg-plist Wed May 24 22:14:14 2017 (r441623) @@ -1,3 +1,5 @@ +@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<< +@comment Alter build-plist target and regenerate as required bin/bugpoint%%LLVM_SUFFIX%% bin/llc%%LLVM_SUFFIX%% bin/lli%%LLVM_SUFFIX%% @@ -64,6 +66,23 @@ bin/sancov%%LLVM_SUFFIX%% %%LIT%%llvm%%LLVM_SUFFIX%%/bin/llvm-lit %%LIT%%bin/FileCheck%%LLVM_SUFFIX%% %%LIT%%llvm%%LLVM_SUFFIX%%/bin/FileCheck +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/__init__.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/_lldb.so +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/attrib_fromdict.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/cache.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/__init__.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/gnu_libstdcpp.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/libcxx.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/metrics.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/synth.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/lldb-argdumper +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/runtime/__init__.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/utils/__init__.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/lldb/utils/symbolication.py +%%LLDB%%llvm%%LLVM_LIB_VER%%/%%PYTHON_SITELIBDIR%%/six.py %%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/asan_blacklist.txt llvm%%LLVM_LIB_VER%%/bin/bugpoint %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/c-index-test @@ -2578,23 +2597,6 @@ llvm%%LLVM_LIB_VER%%/lib/libLTO.so.4 %%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbTarget.a %%LLDB%%llvm%%LLVM_LIB_VER%%/lib/liblldbUtility.a %%OPENMP%%llvm%%LLVM_LIB_VER%%/lib/libomp.so -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/__init__.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/_lldb.so -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/embedded_interpreter.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/formatters/Logger.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/formatters/__init__.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/formatters/attrib_fromdict.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/formatters/cache.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/formatters/cpp/__init__.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/formatters/cpp/gnu_libstdcpp.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/formatters/cpp/libcxx.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/formatters/metrics.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/formatters/synth.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/lldb-argdumper -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/runtime/__init__.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/utils/__init__.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/lldb/utils/symbolication.py -%%LLDB%%llvm%%LLVM_LIB_VER%%/lib/python2.7/site-packages/six.py %%CLANG%%llvm%%LLVM_LIB_VER%%/libexec/c++-analyzer %%CLANG%%llvm%%LLVM_LIB_VER%%/libexec/ccc-analyzer %%CLANG%%llvm%%LLVM_LIB_VER%%/share/clang/clang-format-bbedit.applescript
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705242214.v4OMEEwe049198>