aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2023-09-19 20:45:48 +0300
committerthegeorg <thegeorg@yandex-team.com>2023-09-19 21:02:14 +0300
commitdbeaf2c3a7c53396c09f46615b6c8613d4a72f80 (patch)
tree24d1d5d56a4faab0c4dfbcc7cbb374f815614e17
parent6e4b3cea694724389e8ceaea57de19fba857f3bf (diff)
downloadydb-dbeaf2c3a7c53396c09f46615b6c8613d4a72f80.tar.gz
Remove no-longer-used contrib/libs/libunistring
-rw-r--r--build/sysincl/misc.yml17
1 files changed, 1 insertions, 16 deletions
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index cb5cb41c30..c708acac33 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -32,28 +32,13 @@
includes:
- Python.h: contrib/libs/python/Include/Python.h
-# libunistring, libidn and libidn2
-# have its own libc header wrappers that are added to ADDINCL
-# and need to be added here for consistensy between ADDINCL and sysincl resolving.
-# Btw: we don't parse include_next, so we might lose real dependency to musl,
-# but sysincl resolving will save us here, as it will resolve to both of them.
-- source_filter: "^contrib/libs/libunistring"
- includes:
- - alloca.h: contrib/libs/libunistring/alloca.h
- - langinfo.h: contrib/libs/libunistring/langinfo.h
- - minmax.h: contrib/libs/libunistring/minmax.h
-
+# libidn uses gnulib, allow overriding libc includes
- source_filter: "^contrib/libs/libidn/"
includes:
- alloca.h: contrib/libs/libidn/gl/alloca.h
- error.h: contrib/libs/libidn/gl/error.h
- iconv.h: contrib/libs/libidn/lib/gl/iconv.h
-- source_filter: "^contrib/libs/libidn2/"
- includes:
- - alloca.h: contrib/libs/libidn2/gl/alloca.h
- - error.h: contrib/libs/libidn2/gl/error.h
-
# Same as libunistring - lftp has own libc header wrappers/replacements.
# However here we have GLOBAL ADDINCL to contrib/libs/lftp{,/trio,/lib}
# that can poison resolving in PEERDIRing projects.