Disable empty resolving of locale/ includes

commit_hash:95b202071e63be729f1e78508c621c4aeebeadbb

11 files changed, 16 insertions, 13 deletions

diff --git a/contrib/tools/bison/.yandex_meta/__init__.py b/contrib/tools/bison/.yandex_meta/__init__.py
index 40db21d761..34b99cdde3 100644
--- a/contrib/tools/bison/.yandex_meta/__init__.py
+++ b/contrib/tools/bison/.yandex_meta/__init__.py
@@ -200,6 +200,7 @@ bison = NixProject(
     disable_includes=[
         "InnoTekLIBC/backend.h",
         "bits/libc-lock.h",
+        "libio/",
         "synch.h",
         "random.h",
         "OS.h",
diff --git a/contrib/tools/bison/lib/.yandex_meta/licenses.list.txt b/contrib/tools/bison/lib/.yandex_meta/licenses.list.txt
index 2de281995a..bad6d7d187 100644
--- a/contrib/tools/bison/lib/.yandex_meta/licenses.list.txt
+++ b/contrib/tools/bison/lib/.yandex_meta/licenses.list.txt
@@ -941,7 +941,7 @@ int obstack_exit_failure = EXIT_FAILURE;
 #  endif
 
 #  ifdef _LIBC
-#   include <libio/iolibio.h>
+#   error #include <libio/iolibio.h>
 #  endif
 
 static __attribute_noreturn__ void
diff --git a/contrib/tools/bison/lib/error.c b/contrib/tools/bison/lib/error.c
index a2c8a4962b..e351dad009 100644
--- a/contrib/tools/bison/lib/error.c
+++ b/contrib/tools/bison/lib/error.c
@@ -68,7 +68,7 @@ unsigned int error_message_count;
 # define program_name program_invocation_name
 # include <errno.h>
 # include <limits.h>
-# include <libio/libioP.h>
+# error #include <libio/libioP.h>
 
 /* In GNU libc we want do not want to use the common name 'error' directly.
    Instead make it a weak alias.  */
@@ -81,7 +81,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # define error __error
 # define error_at_line __error_at_line
 
-# include <libio/iolibio.h>
+# error #include <libio/iolibio.h>
 # define fflush(s) _IO_fflush (s)
 # undef putc
 # define putc(c, fp) _IO_putc (c, fp)
diff --git a/contrib/tools/bison/lib/obstack.c b/contrib/tools/bison/lib/obstack.c
index 7a9d588478..e3a6f53c3a 100644
--- a/contrib/tools/bison/lib/obstack.c
+++ b/contrib/tools/bison/lib/obstack.c
@@ -319,7 +319,7 @@ int obstack_exit_failure = EXIT_FAILURE;
 #  endif
 
 #  ifdef _LIBC
-#   include <libio/iolibio.h>
+#   error #include <libio/iolibio.h>
 #  endif
 
 static __attribute_noreturn__ void
diff --git a/contrib/tools/m4/.yandex_meta/__init__.py b/contrib/tools/m4/.yandex_meta/__init__.py
index 46872a8b05..36977f99c6 100644
--- a/contrib/tools/m4/.yandex_meta/__init__.py
+++ b/contrib/tools/m4/.yandex_meta/__init__.py
@@ -170,7 +170,9 @@ m4 = NixProject(
         "gettextP.h",
         "lc-charset-dispatch.h",
         "libc-lock.h",
+        "libio/",
         "localename-table.h",
+        "locale/",
         "../locale/localeinfo.h",
         "OS.h",
         "os2.h",
diff --git a/contrib/tools/m4/lib/.yandex_meta/licenses.list.txt b/contrib/tools/m4/lib/.yandex_meta/licenses.list.txt
index a965e77fd8..c8051facc8 100644
--- a/contrib/tools/m4/lib/.yandex_meta/licenses.list.txt
+++ b/contrib/tools/m4/lib/.yandex_meta/licenses.list.txt
@@ -952,7 +952,7 @@ int obstack_exit_failure = EXIT_FAILURE;
 #  endif
 
 #  ifdef _LIBC
-#   include <libio/iolibio.h>
+#   error #include <libio/iolibio.h>
 #  endif
 
 static _Noreturn void
diff --git a/contrib/tools/m4/lib/error.c b/contrib/tools/m4/lib/error.c
index f77439ecdb..c862373e1f 100644
--- a/contrib/tools/m4/lib/error.c
+++ b/contrib/tools/m4/lib/error.c
@@ -68,7 +68,7 @@ unsigned int error_message_count;
 # define program_name program_invocation_name
 # include <errno.h>
 # include <limits.h>
-# include <libio/libioP.h>
+# error #include <libio/libioP.h>
 
 /* In GNU libc we want do not want to use the common name 'error' directly.
    Instead make it a weak alias.  */
@@ -81,7 +81,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # define error __error
 # define error_at_line __error_at_line
 
-# include <libio/iolibio.h>
+# error #include <libio/iolibio.h>
 # define fflush(s) _IO_fflush (s)
 # undef putc
 # define putc(c, fp) _IO_putc (c, fp)
diff --git a/contrib/tools/m4/lib/obstack.c b/contrib/tools/m4/lib/obstack.c
index b485b615a4..451b80030f 100644
--- a/contrib/tools/m4/lib/obstack.c
+++ b/contrib/tools/m4/lib/obstack.c
@@ -319,7 +319,7 @@ int obstack_exit_failure = EXIT_FAILURE;
 #  endif
 
 #  ifdef _LIBC
-#   include <libio/iolibio.h>
+#   error #include <libio/iolibio.h>
 #  endif
 
 static _Noreturn void
diff --git a/contrib/tools/m4/lib/regcomp.c b/contrib/tools/m4/lib/regcomp.c
index aaa66b9f55..1fb2c95b7c 100644
--- a/contrib/tools/m4/lib/regcomp.c
+++ b/contrib/tools/m4/lib/regcomp.c
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #ifdef _LIBC
-# include <locale/weight.h>
+# error #include <locale/weight.h>
 #endif
 
 static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
diff --git a/contrib/tools/m4/lib/regex_internal.h b/contrib/tools/m4/lib/regex_internal.h
index 16eb228b76..29056094ce 100644
--- a/contrib/tools/m4/lib/regex_internal.h
+++ b/contrib/tools/m4/lib/regex_internal.h
@@ -88,8 +88,8 @@
 #ifdef _LIBC
 # ifndef _RE_DEFINE_LOCALE_FUNCTIONS
 #  define _RE_DEFINE_LOCALE_FUNCTIONS 1
-#   include <locale/localeinfo.h>
-#   include <locale/coll-lookup.h>
+#   error #include <locale/localeinfo.h>
+#   error #include <locale/coll-lookup.h>
 # endif
 #endif
 
@@ -852,7 +852,7 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
 }
 
 # ifdef _LIBC
-#  include <locale/weight.h>
+#  error #include <locale/weight.h>
 # endif
 
 static int
diff --git a/contrib/tools/m4/lib/regexec.c b/contrib/tools/m4/lib/regexec.c
index 895db8208b..85133d2ad3 100644
--- a/contrib/tools/m4/lib/regexec.c
+++ b/contrib/tools/m4/lib/regexec.c
@@ -3758,7 +3758,7 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
    can only accept one byte.  */
 
 # ifdef _LIBC
-#  include <locale/weight.h>
+#  error #include <locale/weight.h>
 # endif
 
 static int