Index: tools/gn/secondary/build/config/linux/BUILD.gn |
diff --git a/tools/gn/secondary/build/config/linux/BUILD.gn b/tools/gn/secondary/build/config/linux/BUILD.gn |
index 159eb2fad4770459fc36a61f87e767f2c8ecc567..4d6d8c16fbcda01bdf3844429b37666d3eb54be0 100644 |
--- a/tools/gn/secondary/build/config/linux/BUILD.gn |
+++ b/tools/gn/secondary/build/config/linux/BUILD.gn |
@@ -13,6 +13,7 @@ config("executable_ldconfig") { |
] |
} |
+# This script re |
scottmg
2013/09/25 21:30:52
unfinished comment
|
pkg_script = "pkg-config.py" |
config("fontconfig") { |
@@ -20,38 +21,39 @@ config("fontconfig") { |
} |
config("freetype2") { |
- cflags = exec_script(pkg_script, [ "--cflags", "freetype2" ], "list lines") |
- ldflags = exec_script(pkg_script, [ "--libs", "freetype2" ], "list lines") |
+ pkgresult = exec_script(pkg_script, [ "freetype2" ], "value") |
+ cflags = pkgresult[0] |
+ ldflags = pkgresult[1] |
} |
config("glib") { |
- glib_packages = "glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0" |
- |
- cflags = exec_script(pkg_script, [ "--cflags", glib_packages ], "list lines") |
- ldflags = exec_script(pkg_script, [ "--libs", glib_packages ], "list lines") |
+ pkgresult = exec_script(pkg_script, |
+ [ "glib-2.0", "gmodule-2.0", "gobject-2.0", "gthread-2.0" ], "value" ) |
+ cflags = pkgresult[0] |
+ ldflags = pkgresult[1] |
} |
config("gtk") { |
# Gtk requires gmodule, but it does not list it as a dependency in some |
# misconfigured systems. |
- gtk_packages = "gmodule-2.0 gtk+-2.0 gthread-2.0" |
+ pkgresult = exec_script(pkg_script, |
+ [ "gmodule-2.0", "gtk+-2.0", "gthread-2.0" ], "value" ) |
+ cflags = pkgresult[0] |
+ ldflags = pkgresult[1] |
defines = [ "TOOLKIT_GTK" ] |
- |
- cflags = exec_script(pkg_script, [ "--cflags", gtk_packages ], "list lines") |
- ldflags = exec_script(pkg_script, [ "--libs", gtk_packages ], "list lines") |
} |
config("pangocairo") { |
- cflags = exec_script(pkg_script, [ "--cflags", "pangocairo" ], "list lines") |
- ldflags = exec_script(pkg_script, [ "--libs", "pangocairo" ], "list lines") |
+ pkgresult = exec_script(pkg_script, [ "pangocairo" ], "value" ) |
+ cflags = pkgresult[0] |
+ ldflags = pkgresult[1] |
} |
config("udev") { |
- udev_packages = "libudev" |
- |
- cflags = exec_script(pkg_script, [ "--cflags", udev_packages ], "list lines") |
- ldflags = exec_script(pkg_script, [ "--libs", udev_packages ], "list lines") |
+ pkgresult = exec_script(pkg_script, [ "libudev" ], "value" ) |
+ cflags = pkgresult[0] |
+ ldflags = pkgresult[1] |
} |
config("x11") { |