mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Switch to EXTRA_PATCHES directories.
Delete unreferenced patches. No functional changes.
This commit is contained in:
parent
43ae39927e
commit
42f77ab841
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=461160
10 changed files with 2 additions and 68 deletions
|
@ -59,12 +59,7 @@ OPTIONS_SUB= yes
|
|||
PLIST_FILES=
|
||||
|
||||
CLANG_DESC= Build clang
|
||||
CLANG_EXTRA_PATCHES= \
|
||||
${PATCHDIR}/clang-patch-fformat_extensions.diff \
|
||||
${PATCHDIR}/clang-patch-fopenmp.diff \
|
||||
${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \
|
||||
${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py \
|
||||
${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_git-clang-format
|
||||
CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang
|
||||
CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]*
|
||||
CLANG_GH_PROJECT= clang:clang
|
||||
CLANG_GH_SUBDIR= tools/clang:clang
|
||||
|
@ -104,8 +99,7 @@ OPENMP_CONFLICTS_INSTALL= libiomp5-devel-*
|
|||
OPENMP_GH_PROJECT= openmp:openmp
|
||||
OPENMP_GH_SUBDIR= projects/openmp:openmp
|
||||
OPENMP_GH_TAGNAME= ${OPENMP_COMMIT}:openmp
|
||||
OPENMP_EXTRA_PATCHES= \
|
||||
${PATCHDIR}/openmp-patch-bug32279
|
||||
OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp
|
||||
GOLD_DESC= Build the LLVM Gold plugin for LTO
|
||||
GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
|
||||
GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
diff --git lib/sanitizer_common/sanitizer_linux.cc lib/sanitizer_common/sanitizer_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 count) {
|
||||
-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
|
||||
+#if SANITIZER_FREEBSD
|
||||
+ return internal_syscall(SYSCALL(getdirentries), fd, (uptr)dirp, count, NULL);
|
||||
+#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);
|
|
@ -1,15 +0,0 @@
|
|||
--- 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:12: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
|
||||
};
|
|
@ -1,10 +0,0 @@
|
|||
--- runtimes/openmp/libomptarget/CMakeLists.txt.orig
|
||||
+++ runtimes/openmp/libomptarget/CMakeLists.txt
|
||||
@@ -94,7 +94,6 @@
|
||||
# Build libomptarget library with libdl dependency.
|
||||
add_library(omptarget SHARED ${src_files})
|
||||
target_link_libraries(omptarget
|
||||
- dl
|
||||
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
|
||||
|
||||
# Install libomptarget under the lib destination folder.
|
Loading…
Add table
Reference in a new issue