build: fix GN build for cares/uv deps

zcbenz · ruyadorno · commit 7008f29d7986 · 2024-11-27T02:25:39.000-05:00
PR-URL: #55477 Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
diff --git a/deps/cares/unofficial.gni b/deps/cares/unofficial.gni
@@ -38,7 +38,10 @@ template("cares_gn_build") {
       ]
     }
 
-    include_dirs = [ "src/lib" ]
+    include_dirs = [
+      "src/lib",
+      "src/lib/include",
+    ]
     if (is_win) {
       include_dirs += [ "config/win32" ]
     } else if (is_linux) {
@@ -55,9 +58,6 @@ template("cares_gn_build") {
     }
 
     sources = gypi_values.cares_sources_common
-    if (is_win) {
-      sources += gypi_values.cares_sources_win
-    }
     if (is_linux) {
       sources += [ "config/linux/ares_config.h" ]
     }
diff --git a/deps/uv/unofficial.gni b/deps/uv/unofficial.gni
@@ -40,6 +40,7 @@ template("uv_gn_build") {
         "-Wno-extra-semi",
         "-Wno-implicit-fallthrough",
         "-Wno-missing-braces",
+        "-Wno-sign-compare",
         "-Wno-string-conversion",
         "-Wno-shadow",
         "-Wno-unreachable-code",
diff --git a/unofficial.gni b/unofficial.gni
@@ -68,6 +68,7 @@ template("node_gn_build") {
       "-Wno-extra-semi",
       "-Wno-implicit-fallthrough",
       "-Wno-macro-redefined",
+      "-Wno-missing-braces",
       "-Wno-return-type",
       "-Wno-shadow",
       "-Wno-sometimes-uninitialized",

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,10 @@ template("cares_gn_build") {`
`38`	`38`	`]`
`39`	`39`	`}`
`40`	`40`
`41`		`- include_dirs = [ "src/lib" ]`
	`41`	`+ include_dirs = [`
	`42`	`+ "src/lib",`
	`43`	`+ "src/lib/include",`
	`44`	`+ ]`
`42`	`45`	`if (is_win) {`
`43`	`46`	`include_dirs += [ "config/win32" ]`
`44`	`47`	`} else if (is_linux) {`
`@@ -55,9 +58,6 @@ template("cares_gn_build") {`
`55`	`58`	`}`
`56`	`59`
`57`	`60`	`sources = gypi_values.cares_sources_common`
`58`		`- if (is_win) {`
`59`		`- sources += gypi_values.cares_sources_win`
`60`		`- }`
`61`	`61`	`if (is_linux) {`
`62`	`62`	`sources += [ "config/linux/ares_config.h" ]`
`63`	`63`	`}`