From d518cd9680f698fb14cb0d355c8f79f54e7c05e3 Mon Sep 17 00:00:00 2001
From: "joth@chromium.org"
 <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 29 Sep 2010 12:27:44 +0000
Subject: First step at OpenSSL client socket implementation.

This is early in-progress implementation, no cert handling supported. So only available under a build-time flag. (GYP_DEFINES="'use_openssl=1'")

Adds a new build dependency for system OpenSSL libraries, and a new USE_OPENSSL define. Eventually this will disable USE_NSS but for now the two coexist.

BUG=none
TEST=build with use_openssl=1. Goto some https:// pages.

Review URL: http://codereview.chromium.org/3495005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60936 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/linux/system.gyp | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

(limited to 'build/linux')

diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 816c584..ed88a0a 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -15,7 +15,7 @@
     }],
     [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
       'variables': {
-        # We use our own copy of libssl, although we still need to link against
+        # We use our own copy of libssl3, although we still need to link against
         # the rest of NSS.
         'use_system_ssl%': 0,
       },
@@ -81,7 +81,7 @@
               ],
               'direct_dependent_settings': {
                 'cflags': [
-                  # We need for our local copies of the libssl headers to come
+                  # We need for our local copies of the libssl3 headers to come
                   # first, otherwise the code will build, but will fallback to
                   # the set of features advertised in the system headers.
                   # Unfortunately, there's no include path that we can filter
@@ -102,7 +102,7 @@
                   '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
                 ],
               },
-          }, {
+            }, {
               'direct_dependent_settings': {
                 'cflags': [
                   '<!@(<(pkg-config) --cflags nss)',
@@ -119,7 +119,8 @@
                   '<!@(<(pkg-config) --libs-only-l nss)',
                 ],
               },
-          }]]
+            }
+          ]]
         }],
       ],
     },
@@ -320,6 +321,32 @@
         ],
       },
     },
+    {
+      'target_name': 'openssl',
+      'type': 'settings',
+      'conditions': [
+        ['use_openssl==1', {
+          'direct_dependent_settings': {
+            'defines': [
+              # OpenSSL support is in development.
+              # eventually USE_OPENSSL and USE_NSS will be mutually exclusive.
+              # During the transitional period, a use_openssl=1 build still
+              # needs to define USE_NSS, so it is necessary to test the
+              # USE_OPENSSL macro before testing USE_NSS.
+              'USE_OPENSSL',
+            ],
+            'include_dirs': [
+              '<!@(<(pkg-config) --cflags openssl)',
+            ],
+          },
+          'link_settings': {
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l openssl)',
+            ],
+          },
+        },],
+      ],
+    },
   ],
 }
 
-- 
cgit v1.1