svn commit: r441627 - in head/devel/llvm39: . files

Cy Schubert Cy.Schubert at komquats.com
Thu May 25 04:12:12 UTC 2017


In message <201705242315.v4ONF0Sd074620 at repo.freebsd.org>, Brooks Davis 
writes:
> Author: brooks
> Date: Wed May 24 23:15:00 2017
> New Revision: 441627
> URL: https://svnweb.freebsd.org/changeset/ports/441627
> 
> Log:
>   Adapt to ino64 changes.[0]
>   
>   Bump dependencies to allow python 3 support.[1]
>   
>   PR:		219502 [0], 219222 [1]
>   Submitted by:	kib [0], Daniel Ylitalo <daniel at blodan.se> [1]
>   Reviewed by:	emaste [0]
>   Differential Revision:	https://reviews.freebsd.org/D10796
> 
> Added:
>   head/devel/llvm39/files/compiler-rt-patch-canonical-syscalls   (contents, p
> rops changed)
>   head/devel/llvm39/files/compiler-rt-patch-ino64   (contents, props changed)
> Modified:
>   head/devel/llvm39/Makefile
>   head/devel/llvm39/pkg-plist
> 
> Modified: head/devel/llvm39/Makefile
> =============================================================================
> =
> --- head/devel/llvm39/Makefile	Wed May 24 22:42:14 2017	(r44162
> 6)
> +++ head/devel/llvm39/Makefile	Wed May 24 23:15:00 2017	(r44162
> 7)
> @@ -2,7 +2,7 @@
>  
>  PORTNAME=	llvm
>  DISTVERSION=	3.9.1
> -PORTREVISION=	5
> +PORTREVISION=	6
>  CATEGORIES=	devel lang
>  MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR
> }
>  PKGNAMESUFFIX=	${LLVM_SUFFIX}
> @@ -89,7 +89,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_Fi
> leSpec.cpp
> @@ -307,10 +307,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
>  
> @@ -341,6 +337,8 @@ post-patch-CLANG-on:
>  
>  post-patch-COMPILER_RT-on:
>  	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-2
> 94806
> +	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-canon
> ical-syscalls
> +	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-ino64
>  
>  post-build-COMPILER_RT-on:
>  	${MKDIR} ${WRKDIR}/compiler-rt-build
> @@ -431,6 +429,8 @@ regression-test: ${BUILD_COOKIE}
>  
>  build-plist:
>  	${RM} ${PLIST} ${PLIST}.tmp
> +	${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLI
> ST}.tmp
> +	${ECHO_CMD} "@comment Alter build-plist target and regenerate as requir
> ed" >> ${PLIST}.tmp
>  .for command in ${COMMANDS}
>  	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp
>  .endfor
> @@ -445,7 +445,8 @@ build-plist:
>  	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
>  	    -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_MAJOR%%|' \
> +	    -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_SITELI
> BDIR%%|' \
> 
> Added: head/devel/llvm39/files/compiler-rt-patch-canonical-syscalls
> =============================================================================
> =
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/devel/llvm39/files/compiler-rt-patch-canonical-syscalls	Wed May
>  24 23:15:00 2017	(r441627)
> @@ -0,0 +1,35 @@
> +diff --git lib/sanitizer_common/sanitizer_linux.cc lib/sanitizer_common/sani
> tizer_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 cou
> nt) {
> +-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
> ++#if SANITIZER_FREEBSD
> ++  return internal_syscall(SYSCALL(getdirentries), fd, (uptr)dirp, count, NU
> LL);
> ++#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/llvm39/files/compiler-rt-patch-ino64
> =============================================================================
> =
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/devel/llvm39/files/compiler-rt-patch-ino64	Wed May 24 23:15:00 201
> 7	(r441627)
> @@ -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:1
> 2: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/llvm39/pkg-plist
> =============================================================================
> =
> --- head/devel/llvm39/pkg-plist	Wed May 24 22:42:14 2017	(r44162
> 6)
> +++ head/devel/llvm39/pkg-plist	Wed May 24 23:15:00 2017	(r44162
> 7)
> @@ -1,3 +1,5 @@
> + at comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<
> + at comment Alter build-plist target and regenerate as required
>  bin/bugpoint39
>  bin/llc39
>  bin/lli39
> @@ -54,6 +56,22 @@ bin/opt39
>  %%LIT%%llvm39/bin/llvm-lit
>  %%LIT%%bin/FileCheck39
>  %%LIT%%llvm39/bin/FileCheck
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/__init__.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/_lldb.so
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/formatters/attrib_fromdict.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/formatters/cache.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/__init__.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/gnu_libstdcpp.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/libcxx.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/formatters/metrics.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/lldb-argdumper
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/runtime/__init__.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/utils/__init__.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/lldb/utils/symbolication.py
> +%%LLDB%%llvm39/%%PYTHON_SITELIBDIR%%/six.py
>  %%COMPILER_RT%%llvm39/asan_blacklist.txt
>  llvm39/bin/bugpoint
>  %%CLANG%%llvm39/bin/c-index-test
> @@ -2440,22 +2458,6 @@ llvm39/lib/libLTO.so
>  %%LLDB%%llvm39/lib/liblldbTarget.a
>  %%LLDB%%llvm39/lib/liblldbUtility.a
>  %%OPENMP%%llvm39/lib/libomp.so
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/__init__.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/_lldb.so
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/embedded_interpreter.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/formatters/Logger.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/formatters/__init__.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/formatters/attrib_fromdict.p
> y
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/formatters/cache.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/formatters/cpp/__init__.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/formatters/cpp/gnu_libstdcpp
> .py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/formatters/cpp/libcxx.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/formatters/metrics.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/lldb-argdumper
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/runtime/__init__.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/utils/__init__.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/lldb/utils/symbolication.py
> -%%LLDB%%llvm39/lib/python2.7/site-packages/six.py
>  %%CLANG%%llvm39/libexec/c++-analyzer
>  %%CLANG%%llvm39/libexec/ccc-analyzer
>  %%CLANG%%llvm39/share/clang/clang-format-bbedit.applescript
> 
> 


Thank you Brooks.


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.




More information about the svn-ports-head mailing list