Date: Sat, 11 Feb 2017 19:21:28 +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: r433904 - in head/devel: llvm38 llvm38/files llvm39 llvm39/files llvm40 llvm40/files Message-ID: <201702111921.v1BJLST4028408@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Feb 11 19:21:28 2017 New Revision: 433904 URL: https://svnweb.freebsd.org/changeset/ports/433904 Log: Apply upstream r294806, remove struct_rtentry_sz on FreeBSD This should fix build on head after _WANT_RTENTRY removal Added: head/devel/llvm38/files/compiler-rt-patch-svn-294806 (contents, props changed) head/devel/llvm39/files/compiler-rt-patch-svn-294806 (contents, props changed) head/devel/llvm40/files/compiler-rt-patch-svn-294806 (contents, props changed) Modified: head/devel/llvm38/Makefile head/devel/llvm39/Makefile head/devel/llvm40/Makefile Modified: head/devel/llvm38/Makefile ============================================================================== --- head/devel/llvm38/Makefile Sat Feb 11 19:05:24 2017 (r433903) +++ head/devel/llvm38/Makefile Sat Feb 11 19:21:28 2017 (r433904) @@ -304,6 +304,7 @@ post-patch: post-patch-COMPILER_RT-on: cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-261229 + cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-294806 .if ${ARCH} == "amd64" cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-no-m32 .endif Added: head/devel/llvm38/files/compiler-rt-patch-svn-294806 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm38/files/compiler-rt-patch-svn-294806 Sat Feb 11 19:21:28 2017 (r433904) @@ -0,0 +1,30 @@ +--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2016-06-01 08:17:03 UTC ++++ 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> +@@ -417,6 +412,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El + 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); +@@ -436,7 +432,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El + 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); Modified: head/devel/llvm39/Makefile ============================================================================== --- head/devel/llvm39/Makefile Sat Feb 11 19:05:24 2017 (r433903) +++ head/devel/llvm39/Makefile Sat Feb 11 19:21:28 2017 (r433904) @@ -314,6 +314,9 @@ post-patch-CLANG-on: ${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \ ${PATCH_WRKSRC}/tools/clang/lib/Driver/Tools.cpp +post-patch-COMPILER_RT-on: + cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-294806 + post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build cd ${WRKDIR}/compiler-rt-build && \ Added: head/devel/llvm39/files/compiler-rt-patch-svn-294806 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm39/files/compiler-rt-patch-svn-294806 Sat Feb 11 19:21:28 2017 (r433904) @@ -0,0 +1,30 @@ +--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2016-04-26 10:41:30 UTC ++++ 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> +@@ -422,6 +417,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El + 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); +@@ -441,7 +437,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El + 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); Modified: head/devel/llvm40/Makefile ============================================================================== --- head/devel/llvm40/Makefile Sat Feb 11 19:05:24 2017 (r433903) +++ head/devel/llvm40/Makefile Sat Feb 11 19:21:28 2017 (r433904) @@ -328,6 +328,9 @@ post-patch-CLANG-on: ${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \ ${PATCH_WRKSRC}/tools/clang/lib/Driver/Tools.cpp +post-patch-COMPILER_RT-on: + cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-294806 + post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build cd ${WRKDIR}/compiler-rt-build && \ Added: head/devel/llvm40/files/compiler-rt-patch-svn-294806 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm40/files/compiler-rt-patch-svn-294806 Sat Feb 11 19:21:28 2017 (r433904) @@ -0,0 +1,30 @@ +--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2016-12-20 07:58:49 UTC ++++ 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> +@@ -433,6 +428,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El + 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); +@@ -452,7 +448,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El + 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?201702111921.v1BJLST4028408>