diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
| commit | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch) | |
| tree | 021998302365c5652e37824b6c26d4d969a62055 /sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch | |
| parent | 70b82ae359a5538711e103b0e8dfb92654296644 (diff) | |
gentoo resync : 03.11.2018
Diffstat (limited to 'sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch')
| -rw-r--r-- | sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch b/sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch index ca871c37b994..f39645669da0 100644 --- a/sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch +++ b/sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch @@ -1,7 +1,7 @@ -From e198d21b9a5851dbc061f60911e3b3da910bca0a Mon Sep 17 00:00:00 2001 +From 6d96ca43ca31bb69d07271696c43b4372ca534d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> Date: Wed, 6 Jun 2018 12:16:38 +0200 -Subject: [PATCH 7/8] [sanitizer_common] Fix using libtirpc on Linux +Subject: [PATCH 1/2] [sanitizer_common] Fix using libtirpc on Linux Fix using libtirpc on Linux by using pkg-config to detect it, and append appropriate include directory. The libtirpc headers reference one @@ -17,10 +17,10 @@ apparently causes it to fail. 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt -index e0226ae49..4071bc0e8 100644 +index ad3aba005..f2a6bab51 100644 --- a/lib/sanitizer_common/CMakeLists.txt +++ b/lib/sanitizer_common/CMakeLists.txt -@@ -151,9 +151,18 @@ include_directories(..) +@@ -191,9 +191,18 @@ include_directories(..) set(SANITIZER_COMMON_DEFINITIONS) @@ -41,7 +41,7 @@ index e0226ae49..4071bc0e8 100644 set(SANITIZER_CFLAGS ${SANITIZER_COMMON_CFLAGS}) append_rtti_flag(OFF SANITIZER_CFLAGS) diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index feb7bad6f..2e736ee26 100644 +index cd1b73d58..c6de2683d 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -146,8 +146,6 @@ typedef struct user_fpregs elf_fpregset_t; @@ -53,7 +53,7 @@ index feb7bad6f..2e736ee26 100644 #endif #include <scsi/scsi.h> #include <sys/mtio.h> -@@ -1236,7 +1234,7 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd); +@@ -1243,7 +1241,7 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd); CHECK_SIZE_AND_OFFSET(group, gr_gid); CHECK_SIZE_AND_OFFSET(group, gr_mem); @@ -63,5 +63,5 @@ index feb7bad6f..2e736ee26 100644 CHECK_SIZE_AND_OFFSET(XDR, x_op); CHECK_SIZE_AND_OFFSET(XDR, x_ops); -- -2.18.0 +2.19.1 |