Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: tools/gn/secondary/build/config/linux/BUILD.gn

Issue 24657003: GN: Return array from pkgconfig wrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/ninja_binary_target_writer.cc ('k') | tools/gn/secondary/build/config/linux/pkg-config.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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") {
« no previous file with comments | « tools/gn/ninja_binary_target_writer.cc ('k') | tools/gn/secondary/build/config/linux/pkg-config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698