Remove empty resolving of TRASH sysincls

commit_hash:44300ee0594c7aa8a17cf283e5d6259270589fb8

9 files changed, 12 insertions, 22 deletions

diff --git a/build/sysincl/unsorted.yml b/build/sysincl/unsorted.yml
index 9d6fa0bae1..1925dcf232 100644
--- a/build/sysincl/unsorted.yml
+++ b/build/sysincl/unsorted.yml
@@ -148,11 +148,6 @@
   - value.h
   - sljit/sljitLir.c
   - pcre_printint.c
-  #if defined(_LIBC) && CONTRIB && TRASH
-  - not-cancel.h
-  - local-setxid.h
-  - vasprintf.h
-  #endif
 
 - includes:
   - cpu-features.h
@@ -269,7 +264,7 @@
   #if defined(HAVE_DMALLOC)
   - dmalloc.h
   #endif
-  #if defined(_TRASH_) && TODO
+	#if defined(_TRASH_) && TODO
   - gcrypt.h
   - gdwmfapi.h
   - winmmap.h
@@ -412,14 +407,6 @@
   - yandex/threads/boost_threaded.hpp
   - yasm-plugin.h
   #endif
-  #if CONTRIB && TRASH
-  - macconfig.h
-  - json_batchallocator.h
-  - json_internalarray.inl
-  - json_internalmap.inl
-  - mysql/mysql_version.h
-  - libiberty.h
-  #endif
 
 - includes:
   #if defined(__FreeBSD__)
@@ -456,9 +443,6 @@
   - sys/tree.h
   - tcpd.h
   #endif
-  #if defined(_TRASH_) && TODO
-  - google/profiler.h
-  #endif
   - net/errno.h
   - sys/mode.h
   - netware.h
diff --git a/contrib/tools/bison/.yandex_meta/__init__.py b/contrib/tools/bison/.yandex_meta/__init__.py
index 009d94080e..40db21d761 100644
--- a/contrib/tools/bison/.yandex_meta/__init__.py
+++ b/contrib/tools/bison/.yandex_meta/__init__.py
@@ -211,6 +211,7 @@ bison = NixProject(
         "mbrtowc-impl.h",
         "lc-charset-dispatch.h",
         "unistring-notinline.h",
+        "vasprintf.h",
     ],
     post_install=post_install,
 )
diff --git a/contrib/tools/bison/lib/asprintf.c b/contrib/tools/bison/lib/asprintf.c
index f97580f745..6ae3cf32ba 100644
--- a/contrib/tools/bison/lib/asprintf.c
+++ b/contrib/tools/bison/lib/asprintf.c
@@ -19,7 +19,7 @@
 
 /* Specification.  */
 #ifdef IN_LIBASPRINTF
-# include "vasprintf.h"
+# error #include "vasprintf.h"
 #else
 # include <stdio.h>
 #endif
diff --git a/contrib/tools/bison/lib/vasprintf.c b/contrib/tools/bison/lib/vasprintf.c
index 7bb21dde3b..76d8cab754 100644
--- a/contrib/tools/bison/lib/vasprintf.c
+++ b/contrib/tools/bison/lib/vasprintf.c
@@ -18,7 +18,7 @@
 
 /* Specification.  */
 #ifdef IN_LIBASPRINTF
-# include "vasprintf.h"
+# error #include "vasprintf.h"
 #else
 # include <stdio.h>
 #endif
diff --git a/contrib/tools/bison/ya.make b/contrib/tools/bison/ya.make
index 9ec7f6aebe..32b26e7b76 100644
--- a/contrib/tools/bison/ya.make
+++ b/contrib/tools/bison/ya.make
@@ -1,4 +1,4 @@
-# Generated by devtools/yamaker from nixpkgs 22.11.
+# Generated by devtools/yamaker from nixpkgs 24.05.
 
 PROGRAM(bison)
 
diff --git a/contrib/tools/m4/.yandex_meta/__init__.py b/contrib/tools/m4/.yandex_meta/__init__.py
index 657a7148a3..46872a8b05 100644
--- a/contrib/tools/m4/.yandex_meta/__init__.py
+++ b/contrib/tools/m4/.yandex_meta/__init__.py
@@ -184,6 +184,7 @@ m4 = NixProject(
         "sys/ps.h",
         "sys/single_threaded.h",
         "unistring-notinline.h",
+        "vasprintf.h",
     ],
     put={
         "libm4": "lib",
diff --git a/contrib/tools/m4/.yandex_meta/override.nix b/contrib/tools/m4/.yandex_meta/override.nix
index a1710c37d9..6be4d2e72c 100644
--- a/contrib/tools/m4/.yandex_meta/override.nix
+++ b/contrib/tools/m4/.yandex_meta/override.nix
@@ -5,4 +5,8 @@ pkgs: attrs: with pkgs; with attrs; rec {
     url = "mirror://gnu/m4/m4-${version}.tar.bz2";
     sha256 = "sha256-ZkDXawQ7xlgTnIkD4pPVl4MJvw9AgQcUZQXspwHmfPY=";
   };
+
+  configureFlags = [
+    "--build=x86_64-unknown-linux-gnu"
+  ];
 }
diff --git a/contrib/tools/m4/lib/config-linux.h b/contrib/tools/m4/lib/config-linux.h
index aa814feb46..e30042e007 100644
--- a/contrib/tools/m4/lib/config-linux.h
+++ b/contrib/tools/m4/lib/config-linux.h
@@ -1428,7 +1428,7 @@
 #define STRERROR_R_CHAR_P 1
 
 /* Shell used by syscmd and esyscmd, must accept -c argument. */
-#define SYSCMD_SHELL "/var/empty/bash-4.4-p23/bin/bash"
+#define SYSCMD_SHELL "/bin/sh"
 
 /* Define to the prefix of C symbols at the assembler and linker level, either
    an underscore or empty. */
diff --git a/contrib/tools/m4/lib/vasprintf.c b/contrib/tools/m4/lib/vasprintf.c
index a5dc1beb4e..abbdef7e9f 100644
--- a/contrib/tools/m4/lib/vasprintf.c
+++ b/contrib/tools/m4/lib/vasprintf.c
@@ -18,7 +18,7 @@
 
 /* Specification.  */
 #ifdef IN_LIBASPRINTF
-# include "vasprintf.h"
+# error #include "vasprintf.h"
 #else
 # include <stdio.h>
 #endif