Added USE_GDK, set when either TOOLKIT_GTK or TOOLKIT_VIEWS is set but

not OS_WIN.

Added USE_X11. Set when OS_LINUX or OS_FREEBSD is set.

Added USE_BASE_DATA_PACK for base::DataPack usage, set for OS_MACOSX,
OS_LINUX or OS_FREEBSD.

Added USE_NSS for ... nss (for crypto). Windows and MacOS use
platform-specific libraries.

All of the above cause slightly odd formulations like:

#if defined(OS_WIN)
...
#elif defined(USE_BASE_DATA_PACK)
...
#endif

Possibly should also define USE_DLL_FOR_DATA, etc? Or something?

Wrapped various references to struct stat64 and stat64() to use struct
stat and stat() for FreeBSD - but a "man stat64" on Linux suggests
that we could do the same thing for at least Linux, too, and perhaps
eliminate the wrapper?


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25599 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 28 insertions, 15 deletions

diff --git a/base/base.gyp b/base/base.gyp
index 6636b53..d0a2209 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -366,7 +366,7 @@
         4244, 4554, 4018, 4102,
       ],
       'conditions': [
-        [ 'OS == "linux"', {
+        [ 'OS == "linux" or OS == "freebsd"', {
             'variables' : {
               'linux_use_tcmalloc%': 0,
             },
@@ -398,17 +398,21 @@
             'cflags': [
               '-Wno-write-strings',
             ],
-            'link_settings': {
-              'libraries': [
-                # We need rt for clock_gettime().
-                '-lrt',
-              ],
-            },
+	    'conditions': [
+	      [ 'OS == "linux"', {
+	        'link_settings': {
+		  'libraries': [
+                    # We need rt for clock_gettime().
+                    '-lrt',
+                  ],
+                },
+              },
+            ] ],
             'export_dependent_settings': [
               '../build/linux/system.gyp:gtk',
             ],
           },
-          {  # else: OS != "linux"
+          {  # else: OS != "linux" && OS != "freebsd"
             'sources/': [
               ['exclude', '/xdg_mime/'],
             ],
@@ -437,6 +441,15 @@
             ],
           },
         ],
+        [ 'OS == "freebsd"', {
+            'sources!': [
+              'directory_watcher_inotify.cc',
+            ],
+            'sources': [
+              'directory_watcher_stub.cc',
+            ],
+          },
+        ],
         [ 'OS == "mac"', {
             'sources/': [ ['exclude', '_(linux|win|chromeos)\\.cc$'] ],
             'sources!': [
@@ -544,7 +557,7 @@
         'base',
       ],
       'conditions': [
-        ['OS == "linux"', {
+        ['OS == "linux" or OS == "freebsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
@@ -554,7 +567,7 @@
             'gfx/native_theme.cc',
             ],
         }],
-        [ 'OS != "linux"', { 'sources!': [
+        [ 'OS != "linux" and OS != "freebsd"', { 'sources!': [
             'gfx/gtk_native_view_id_manager.cc',
             'gfx/gtk_util.cc',
             'gfx/native_widget_types_gtk.cc',
@@ -663,7 +676,7 @@
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
-        ['OS == "linux"', {
+        ['OS == "linux" or OS == "freebsd"', {
           'sources!': [
             'file_version_info_unittest.cc',
             # Linux has an implementation of idle_timer, but it's unclear
@@ -675,7 +688,7 @@
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
           ],
-        }, {  # OS != "linux"
+        }, {  # OS != "linux" and OS != "freebsd"
           'sources!': [
             'message_pump_glib_unittest.cc',
           ]
@@ -727,7 +740,7 @@
         'test_file_util_win.cc',
       ],
       'conditions': [
-        [ 'OS == "linux"', {
+        [ 'OS == "linux" or OS == "freebsd"', {
             'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'],
                           ['exclude', '\\.mm?$' ] ],
             'conditions': [
@@ -766,7 +779,7 @@
         ],
       },
       'conditions': [
-        ['OS == "linux"', {
+        ['OS == "linux" or OS == "freebsd"', {
           'dependencies': [
             # Needed to handle the #include chain:
             #   base/perf_test_suite.h
@@ -795,7 +808,7 @@
         },
       ],
     }],
-    [ 'OS == "linux"', {
+    [ 'OS == "linux" or OS == "freebsd"', {
       'targets': [
         {
           'target_name': 'linux_versioninfo',