Date: Sat, 11 Feb 2017 16:24:33 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433889 - in head/devel/llvm37: . files Message-ID: <201702111624.v1BGOXdt054766@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/param.h> +-#include <sys/socketvar.h> +-#endif + #include <arpa/inet.h> + #include <dirent.h> + #include <errno.h> +@@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702111624.v1BGOXdt054766>