aboutsummaryrefslogtreecommitdiffstats
path: root/build/sysincl
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-07-03 20:23:46 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-07-03 20:33:25 +0300
commitea072dca50b833313f0491a85b7f13d78ed3fecb (patch)
tree4c30d555c74863aaa05be47205eaa1a7e205d2d6 /build/sysincl
parentaa44c800e955f38b8878476240f248f02349d105 (diff)
downloadydb-ea072dca50b833313f0491a85b7f13d78ed3fecb.tar.gz
Extract usable parts of linux.yml to proper files
Certain sysincls from `build/sysincl/linux.yml` (at least `linux/irda.h`) point into OS_SDK, while we actually have `contrib/libs/linux-headers`. This PRs moves irrelevant parts out of `linux.yml`. e2d06cb4ffd0c7b45919caefe0eca42d000e8bc7
Diffstat (limited to 'build/sysincl')
-rw-r--r--build/sysincl/jdk-to-arcadia.yml6
-rw-r--r--build/sysincl/jdk-to-system.yml (renamed from build/sysincl/system-jdk.yml)0
-rw-r--r--build/sysincl/linux.yml13
-rw-r--r--build/sysincl/misc.yml4
4 files changed, 10 insertions, 13 deletions
diff --git a/build/sysincl/jdk-to-arcadia.yml b/build/sysincl/jdk-to-arcadia.yml
new file mode 100644
index 0000000000..c211f6c979
--- /dev/null
+++ b/build/sysincl/jdk-to-arcadia.yml
@@ -0,0 +1,6 @@
+- includes:
+ - jni.h: contrib/libs/jdk/include/jni.h
+ - jni_md.h:
+ - contrib/libs/jdk/include/darwin/jni_md.h
+ - contrib/libs/jdk/include/linux/jni_md.h
+ - contrib/libs/jdk/include/win32/jni_md.h
diff --git a/build/sysincl/system-jdk.yml b/build/sysincl/jdk-to-system.yml
index d894941ad4..d894941ad4 100644
--- a/build/sysincl/system-jdk.yml
+++ b/build/sysincl/jdk-to-system.yml
diff --git a/build/sysincl/linux.yml b/build/sysincl/linux.yml
index 34bbf867d7..a92a09bb9c 100644
--- a/build/sysincl/linux.yml
+++ b/build/sysincl/linux.yml
@@ -52,16 +52,3 @@
- ttyent.h
- ustat.h
- xlocale.h
-
-- includes:
- - jni.h: contrib/libs/jdk/include/jni.h
- - jni_md.h:
- - contrib/libs/jdk/include/darwin/jni_md.h
- - contrib/libs/jdk/include/linux/jni_md.h
- - contrib/libs/jdk/include/win32/jni_md.h
-
-# These are stubs for actual resolving into system
-- source_filter: "^contrib/libs/glibcasm"
- includes:
- - stdc-predef.h: contrib/libs/glibcasm/glibc/include/stdc-predef.h
- - gnu/stubs.h: contrib/libs/glibcasm/glibc/include/gnu/stubs.h
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index f66cf864a7..42b9749ed1 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -502,6 +502,10 @@
- tls.h: contrib/libs/glibcasm/glibc/sysdeps/x86_64/nptl/tls.h
- unistd.h: contrib/libs/glibcasm/glibc/include/unistd.h
- unwind.h: contrib/libs/glibcasm/glibc/sysdeps/generic/unwind.h
+ # These are stubs for actual resolving into system
+ - stdc-predef.h: contrib/libs/glibcasm/glibc/include/stdc-predef.h
+ - gnu/stubs.h: contrib/libs/glibcasm/glibc/include/gnu/stubs.h
+
- source_filter: "^contrib/libs/libunwind/include/unwind.h"
includes: