Further cleanup build/sysincl/misc.yml

commit_hash:0d37816894a658ecc91569c3eacb8e1022ea49ce

4 files changed, 21 insertions, 33 deletions

diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index 0632adbc1a..700a1fe7bd 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -197,25 +197,6 @@
   includes:
     - cuda.h:        contrib/deprecated/tf/tensorflow/core/platform/cuda.h
 
-# windows sdk includes that we do not want to apply for whole arcadia
-- source_filter: "^contrib"
-  includes:
-    - process.h
-
-- source_filter: "^contrib/libs/ceres-solver"
-  includes:
-    - tbb/tbb_stddef.h
-
-- source_filter: "^contrib/libs/freetype"
-  includes:
-    - hb-ot.h
-    - hb-ft.h
-    - hb.h
-
-- source_filter: "^contrib/libs/libpcap"
-  includes:
-    - strerror.h
-
 - source_filter: "^contrib/libs/(apache/apr|openssl)"
   includes:
     - netinet/sctp.h
diff --git a/contrib/libs/freetype/.yandex_meta/__init__.py b/contrib/libs/freetype/.yandex_meta/__init__.py
index 12f003055f..7b79bd5d36 100644
--- a/contrib/libs/freetype/.yandex_meta/__init__.py
+++ b/contrib/libs/freetype/.yandex_meta/__init__.py
@@ -43,6 +43,9 @@ freetype = GNUMakeNixProject(
         "inffast.c",
         "inflate.c",
         "inftrees.c",
+        "hb.h",
+        "hb-ft.h",
+        "hb-ot.h",
         "openssl/md5.h",
         "png.h",
         "zutil.c",
diff --git a/contrib/libs/freetype/.yandex_meta/override.nix b/contrib/libs/freetype/.yandex_meta/override.nix
index 4d0742cd07..9d9b2a3974 100644
--- a/contrib/libs/freetype/.yandex_meta/override.nix
+++ b/contrib/libs/freetype/.yandex_meta/override.nix
@@ -2,6 +2,18 @@ self: super: with self; rec {
   pname = "freetype";
   version = "2.13.3";
 
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "freetype";
+    repo = "freetype";
+    rev = "VER-${self.lib.replaceStrings ["."] ["-"] version}";
+    hash = "sha256-HJ4gKR+gLudollVsYhKQPKa6xAuM8RlCTwUhMQENFdQ=";
+    leaveDotGit = true;
+    fetchSubmodules = true;
+  };
+
+  patches = [];
+
   # autoreconfHook doesn't work here somehow
   nativeBuildInputs = [ autoconf automake libtool ];
 
@@ -9,21 +21,13 @@ self: super: with self; rec {
 
   preConfigure = "./autogen.sh";
 
+  configureFlags = [
+    "--build=x86_64-unknown-linux-gnu"
+  ];
+
   CFLAGS = [
     "-DFT_CONFIG_OPTION_SYSTEM_ZLIB"
     "-DFT_DEBUG_LEVEL_TRACE"
     "-DFT_DEBUG_LOGGING"
   ];
-
-  src = fetchFromGitLab {
-    domain = "gitlab.freedesktop.org";
-    owner = "freetype";
-    repo = "freetype";
-    rev = "VER-${self.lib.replaceStrings ["."] ["-"] version}";
-    hash = "sha256-HJ4gKR+gLudollVsYhKQPKa6xAuM8RlCTwUhMQENFdQ=";
-    leaveDotGit = true;
-    fetchSubmodules = true;
-  };
-
-  patches = [];
 }
diff --git a/contrib/libs/freetype/src/autofit/afshaper.h b/contrib/libs/freetype/src/autofit/afshaper.h
index 1182ee6361..a40ba3ce74 100644
--- a/contrib/libs/freetype/src/autofit/afshaper.h
+++ b/contrib/libs/freetype/src/autofit/afshaper.h
@@ -25,8 +25,8 @@
 
 #ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
 
-#include <hb.h>
-#include <hb-ot.h>
+#error #include <hb.h>
+#error #include <hb-ot.h>
 #error #include "ft-hb.h"
 
 #endif