From 75c60c1aa64a03889641bfc0fdbace7f440097b9 Mon Sep 17 00:00:00 2001
From: "agl@chromium.org"
 <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 18 Aug 2009 22:04:36 +0000
Subject: Don't pass --atleast-version to pkg-config.

Turns out that pkgconfig produces no output if --atleast-version is
given. Thus we list the cflags twice, once to catch the version error
and then a second time to get the flags we need.

(Reported by fta.)


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23660 0039d316-1c4b-4281-b951-d872f2087c98
---
 third_party/sqlite/sqlite.gyp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'third_party')

diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index 4a4d869..62733df 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -28,20 +28,23 @@
           'type': 'settings',
           'direct_dependent_settings': {
             'cflags': [
-              '<!@(pkg-config --cflags --atleast-version=<(required_sqlite_version) sqlite3)',
+              # This next command produces no output but it it will fail (and
+              # cause GYP to fail) if we don't have a recent enough version of
+              # sqlite.
+              '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlite3)',
+
+              '<!@(pkg-config --cflags sqlite3)',
             ],
-          },
-          'direct_dependent_settings': {
             'defines': [
               'USE_SYSTEM_SQLITE',
             ],
           },
           'link_settings': {
             'ldflags': [
-              '<!@(pkg-config --atleast-version=<(required_sqlite_version) --libs-only-L --libs-only-other sqlite3)',
+              '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)',
             ],
             'libraries': [
-              '<!@(pkg-config --atleast-version=<(required_sqlite_version) --libs-only-l sqlite3)',
+              '<!@(pkg-config --libs-only-l sqlite3)',
             ],
           },
         }, { # else: OS != "linux" or ! use_system_sqlite
-- 
cgit v1.1