From owner-svn-ports-all@freebsd.org Sat Feb 11 16:24:34 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96A74CDB82A; Sat, 11 Feb 2017 16:24:34 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AE0217CB; Sat, 11 Feb 2017 16:24:34 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1BGOXwv054769; Sat, 11 Feb 2017 16:24:33 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1BGOXdt054766; Sat, 11 Feb 2017 16:24:33 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201702111624.v1BGOXdt054766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 11 Feb 2017 16:24:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433889 - in head/devel/llvm37: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2017 16:24:34 -0000 Author: antoine Date: Sat Feb 11 16:24:33 2017 New Revision: 433889 URL: https://svnweb.freebsd.org/changeset/ports/433889 Log: Apply upstream r294806, remove struct_rtentry_sz on FreeBSD This should fix build on head after _WANT_RTENTRY removal Added: head/devel/llvm37/files/compiler-rt-patch-svn-294806 (contents, props changed) Modified: head/devel/llvm37/Makefile Modified: head/devel/llvm37/Makefile ============================================================================== --- head/devel/llvm37/Makefile Sat Feb 11 16:19:13 2017 (r433888) +++ head/devel/llvm37/Makefile Sat Feb 11 16:24:33 2017 (r433889) @@ -55,7 +55,8 @@ CLANG_PORTDOCS= clang COMPILER_RT_DESC= Build compiler-rt (sanitizers) COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_EXTRA_PATCHES= \ - ${PATCHDIR}/compiler-rt-patch-svn-249051 + ${PATCHDIR}/compiler-rt-patch-svn-249051 \ + ${PATCHDIR}/compiler-rt-patch-svn-294806 DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ Added: head/devel/llvm37/files/compiler-rt-patch-svn-294806 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm37/files/compiler-rt-patch-svn-294806 Sat Feb 11 16:24:33 2017 (r433889) @@ -0,0 +1,30 @@ +--- tools/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2015-06-25 20:50:18 UTC ++++ tools/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -23,11 +23,6 @@ + #ifdef _FILE_OFFSET_BITS + #undef _FILE_OFFSET_BITS + #endif +-#if SANITIZER_FREEBSD +-#define _WANT_RTENTRY +-#include +-#include +-#endif + #include + #include + #include +@@ -374,6 +369,7 @@ namespace __sanitizer { + unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo); + unsigned struct_input_id_sz = sizeof(struct input_id); + unsigned struct_mtpos_sz = sizeof(struct mtpos); ++ unsigned struct_rtentry_sz = sizeof(struct rtentry); + unsigned struct_termio_sz = sizeof(struct termio); + unsigned struct_vt_consize_sz = sizeof(struct vt_consize); + unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes); +@@ -393,7 +389,6 @@ namespace __sanitizer { + unsigned struct_midi_info_sz = sizeof(struct midi_info); + unsigned struct_mtget_sz = sizeof(struct mtget); + unsigned struct_mtop_sz = sizeof(struct mtop); +- unsigned struct_rtentry_sz = sizeof(struct rtentry); + unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument); + unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec); + unsigned struct_synth_info_sz = sizeof(struct synth_info);