mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
Apply upstream r294806, remove struct_rtentry_sz on FreeBSD
This should fix build on head after _WANT_RTENTRY removal
This commit is contained in:
parent
f6699c1fda
commit
b3518867ef
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=433904
@ -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
|
||||
|
30
devel/llvm38/files/compiler-rt-patch-svn-294806
Normal file
30
devel/llvm38/files/compiler-rt-patch-svn-294806
Normal file
@ -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);
|
@ -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 && \
|
||||
|
30
devel/llvm39/files/compiler-rt-patch-svn-294806
Normal file
30
devel/llvm39/files/compiler-rt-patch-svn-294806
Normal file
@ -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);
|
@ -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 && \
|
||||
|
30
devel/llvm40/files/compiler-rt-patch-svn-294806
Normal file
30
devel/llvm40/files/compiler-rt-patch-svn-294806
Normal file
@ -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);
|
Loading…
Reference in New Issue
Block a user