diff options
20 files changed, 169 insertions, 47 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 45db9de..9931fda 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -458,7 +458,7 @@ 'browser/debugger/inspectable_tab_proxy.h', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -535,7 +535,7 @@ 'plugin/command_buffer_stub.h', ], },], - ['OS=="linux" or OS=="freebsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -824,7 +824,7 @@ 'sync_proto', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk' ], @@ -967,7 +967,7 @@ 'browser/sync/util/data_encryption.h', ], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk' ], @@ -1515,7 +1515,7 @@ }, ]}, # 'targets' ], # OS=="win" - ['OS=="linux" or OS=="freebsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'targets': [{ 'target_name': 'packed_resources', 'type': 'none', @@ -1601,7 +1601,7 @@ }, ], }], # targets - }], # OS=="linux" or OS=="freebsd" + }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" ], # 'conditions' } diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp index dba1612..21eedfa 100644 --- a/courgette/courgette.gyp +++ b/courgette/courgette.gyp @@ -93,7 +93,7 @@ '../testing/gtest.gyp:gtest', ], 'conditions': [ - [ 'OS == "linux" or OS == "freebsd"', { + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 'dependencies': [ # Workaround for gyp bug 69. # Needed to handle the #include chain: @@ -118,7 +118,7 @@ '../testing/gtest.gyp:gtest', ], 'conditions': [ - [ 'OS == "linux" or OS == "freebsd"', { + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 'dependencies': [ # Workaround for gyp bug 69. # Needed to handle the #include chain: diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp index d823bec..07141fe 100644 --- a/ipc/ipc.gyp +++ b/ipc/ipc.gyp @@ -10,7 +10,7 @@ ['exclude', '/win_[^/]*\\.cc$'], ], 'conditions': [ - ['OS=="linux"', {'sources/': [ + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [ ['include', '_posix(_unittest)?\\.cc$'], ]}], ['OS=="mac"', {'sources/': [ @@ -53,7 +53,7 @@ 'sync_socket_unittest.cc', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -63,7 +63,7 @@ '../views/views.gyp:views', ], }], - ['OS=="linux" or OS=="freebsd"', { + ['OS=="linux"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ diff --git a/printing/native_metafile.h b/printing/native_metafile.h index 2c71986..b0f957a 100644 --- a/printing/native_metafile.h +++ b/printing/native_metafile.h @@ -34,9 +34,9 @@ typedef PdfMetafile NativeMetafile; } // namespace printing -#elif defined(OS_LINUX) +#elif defined(OS_POSIX) -#include "printing/pdf_ps_metafile_linux.h" +#include "printing/pdf_ps_metafile_cairo.h" namespace printing { diff --git a/printing/pdf_ps_metafile_linux.cc b/printing/pdf_ps_metafile_cairo.cc index a3da6ee..db70d08 100644 --- a/printing/pdf_ps_metafile_linux.cc +++ b/printing/pdf_ps_metafile_cairo.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "printing/pdf_ps_metafile_linux.h" +#include "printing/pdf_ps_metafile_cairo.h" #include <stdio.h> diff --git a/printing/pdf_ps_metafile_linux.h b/printing/pdf_ps_metafile_cairo.h index 6f92b66..1a7bd01 100644 --- a/printing/pdf_ps_metafile_linux.h +++ b/printing/pdf_ps_metafile_cairo.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PRINTING_PDF_PS_METAFILE_LINUX_H_ -#define PRINTING_PDF_PS_METAFILE_LINUX_H_ +#ifndef PRINTING_PDF_PS_METAFILE_CAIRO_H_ +#define PRINTING_PDF_PS_METAFILE_CAIRO_H_ #include <string> @@ -107,4 +107,4 @@ class PdfPsMetafile { } // namespace printing -#endif // PRINTING_PDF_PS_METAFILE_LINUX_H_ +#endif // PRINTING_PDF_PS_METAFILE_CAIRO_H_ diff --git a/printing/pdf_ps_metafile_linux_unittest.cc b/printing/pdf_ps_metafile_cairo_unittest.cc index e852b37..6dfd70a 100644 --- a/printing/pdf_ps_metafile_linux_unittest.cc +++ b/printing/pdf_ps_metafile_cairo_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "printing/pdf_ps_metafile_linux.h" +#include "printing/pdf_ps_metafile_cairo.h" #include <fcntl.h> #include <string> diff --git a/printing/printed_document_linux.cc b/printing/printed_document_cairo.cc index 8386914..8386914 100644 --- a/printing/printed_document_linux.cc +++ b/printing/printed_document_cairo.cc diff --git a/printing/printing.gyp b/printing/printing.gyp index 3f48ef7..2e255a0 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -39,12 +39,12 @@ 'page_setup.h', 'pdf_metafile_mac.h', 'pdf_metafile_mac.cc', - 'pdf_ps_metafile_linux.h', - 'pdf_ps_metafile_linux.cc', + 'pdf_ps_metafile_cairo.h', + 'pdf_ps_metafile_cairo.cc', 'print_settings.cc', 'print_settings.h', 'printed_document.cc', - 'printed_document_linux.cc', + 'printed_document_cairo.cc', 'printed_document_mac.cc', 'printed_document_win.cc', 'printed_document.h', @@ -52,7 +52,7 @@ 'printed_page.h', 'printed_pages_source.h', 'printing_context.h', - 'printing_context_linux.cc', + 'printing_context_cairo.cc', 'printing_context_mac.mm', 'printing_context_win.cc', 'units.cc', @@ -64,13 +64,15 @@ ], }, 'conditions': [ - ['OS!="linux"', {'sources/': [['exclude', '_linux\\.cc$']]}], + ['OS!="linux" and OS!="freebsd" and OS!="openbsd"',{ + 'sources/': [['exclude', '_cairo\\.cc$']] + }], ['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}], ['OS!="win"', {'sources/': [['exclude', '_win\\.cc$']] }, { # else: OS=="win" 'sources/': [['exclude', '_posix\\.cc$']] }], - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ # For FT_Init_FreeType and friends. '../build/linux/system.gyp:freetype2', @@ -94,25 +96,25 @@ 'page_range_unittest.cc', 'page_setup_unittest.cc', 'pdf_metafile_mac_unittest.cc', - 'pdf_ps_metafile_linux_unittest.cc', + 'pdf_ps_metafile_cairo_unittest.cc', 'printing_context_win_unittest.cc', 'run_all_unittests.cc', 'units_unittest.cc', ], 'conditions': [ - ['OS!="linux"', {'sources/': [['exclude', '_linux_unittest\\.cc$']]}], + ['OS!="linux"', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}], ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}], ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']] }, { # else: OS=="win" - 'sources/': [['exclude', '_posix_unittest\\.cc$']] + 'sources/': [['exclude', '_cairo_unittest\\.cc$']] } ], - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], }], - ['OS=="linux" or OS=="freebsd"', { + ['OS=="linux"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ diff --git a/printing/printing_context_linux.cc b/printing/printing_context_cairo.cc index fcc51f7..fcc51f7 100644 --- a/printing/printing_context_linux.cc +++ b/printing/printing_context_cairo.cc diff --git a/sdch/bsd/config.h b/sdch/bsd/config.h new file mode 100644 index 0000000..44417b4 --- /dev/null +++ b/sdch/bsd/config.h @@ -0,0 +1,113 @@ +/* src/config.h. Generated by SCons. */ +/* src/config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the <dlfcn.h> header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the <ext/rope> header file. */ +/* #undef HAVE_EXT_ROPE */ + +/* Define to 1 if you have the <fnmatch.h> header file. */ +/* #undef HAVE_FNMATCH_H */ + +/* Define to 1 if you have the <getopt.h> header file. */ +/* #undef HAVE_GETOPT_H */ + +/* Define to 1 if you have the `gettimeofday' function. */ +/* #undef HAVE_GETTIMEOFDAY */ + +/* Define to 1 if you have the <inttypes.h> header file. */ +/* #undef HAVE_INTTYPES_H */ + +/* Define to 1 if you have the <malloc.h> header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define to 1 if you have the `memalign' function. */ +/* #undef HAVE_MEMALIGN */ + +/* Define to 1 if you have the <memory.h> header file. */ +/* #undef HAVE_MEMORY_H */ + +/* Define to 1 if you have the `mprotect' function. */ +/* #undef HAVE_MPROTECT */ + +/* Define to 1 if you have the `posix_memalign' function. */ +/* #undef HAVE_POSIX_MEMALIGN */ + +/* Define to 1 if you have the `QueryPerformanceCounter' function. */ +/* #undef HAVE_QUERYPERFORMANCECOUNTER */ + +/* Define to 1 if you have the <stdint.h> header file. */ +/* #undef HAVE_STDINT_H */ + +/* Define to 1 if you have the <stdlib.h> header file. */ +/* #undef HAVE_STDLIB_H */ + +/* Define to 1 if you have the <strings.h> header file. */ +/* #undef HAVE_STRINGS_H */ + +/* Define to 1 if you have the <string.h> header file. */ +/* #undef HAVE_STRING_H */ + +/* Define to 1 if you have the `strtoll' function. */ +/* #undef HAVE_STRTOLL */ + +/* Define to 1 if you have the `strtoq' function. */ +/* #undef HAVE_STRTOQ */ + +/* Define to 1 if you have the <sys/mman.h> header file. */ +/* #undef HAVE_SYS_MMAN_H */ + +/* Define to 1 if you have the <sys/stat.h> header file. */ +/* #undef HAVE_SYS_STAT_H */ + +/* Define to 1 if you have the <sys/time.h> header file. */ +/* #undef HAVE_SYS_TIME_H */ + +/* Define to 1 if you have the <sys/types.h> header file. */ +/* #undef HAVE_SYS_TYPES_H */ + +/* Define to 1 if the system has the type `uint16_t'. */ +/* #undef HAVE_UINT16_T */ + +/* Define to 1 if you have the <unistd.h> header file. */ +/* #undef HAVE_UNISTD_H */ + +/* Define to 1 if the system has the type `u_int16_t'. */ +/* #undef HAVE_U_INT16_T */ + +/* Define to 1 if you have the <windows.h> header file. */ +/* #undef HAVE_WINDOWS_H */ + +/* define if your compiler has __attribute__ */ +/* #undef HAVE___ATTRIBUTE__ */ + +/* Define to 1 if the system has the type `__int16'. */ +/* #undef HAVE___INT16 */ + +/* Name of package */ +/* #undef PACKAGE */ + +/* Define to the address where bug reports for this package should be sent. */ +/* #undef PACKAGE_BUGREPORT */ + +/* Define to the full name of this package. */ +/* #undef PACKAGE_NAME */ + +/* Define to the full name and version of this package. */ +/* #undef PACKAGE_STRING */ + +/* Define to the one symbol short name of this package. */ +/* #undef PACKAGE_TARNAME */ + +/* Define to the version of this package. */ +/* #undef PACKAGE_VERSION */ + +/* Define to 1 if you have the ANSI C header files. */ +/* #undef STDC_HEADERS */ + +/* Use custom compare function instead of memcmp */ +/* #undef VCDIFF_USE_BLOCK_COMPARE_WORDS */ + +/* Version number of package */ +/* #undef VERSION */ diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp index acb4312..42d1f81 100644 --- a/sdch/sdch.gyp +++ b/sdch/sdch.gyp @@ -55,6 +55,7 @@ }, 'conditions': [ [ 'OS == "linux"', { 'include_dirs': [ 'linux' ] } ], + [ 'OS == "freebsd" or OS == "openbsd"', { 'include_dirs': [ 'bsd' ] } ], [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ], [ 'OS == "win"', { 'include_dirs': [ 'open-vcdiff/vsprojects' ] } ], ], diff --git a/skia/skia.gyp b/skia/skia.gyp index cc12b5d..f279b84 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -566,7 +566,7 @@ ['exclude', '_mac\\.(cc|cpp|mm?)$'], ['exclude', '/mac/'] ], }], - [ 'OS != "linux"', { + [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd"', { 'sources/': [ ['exclude', '_(linux|gtk)\\.(cc|cpp)$'] ], 'sources!': [ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', @@ -590,7 +590,7 @@ '../third_party/skia/src/opts/opts_check_SSE2.cpp' ], }], - [ 'OS == "linux" or OS == "freebsd"', { + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gdk', '../build/linux/system.gyp:fontconfig', diff --git a/testing/gtest.gyp b/testing/gtest.gyp index cdd70c5..c8f64e5 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -59,7 +59,7 @@ ], }, }], - ['OS == "mac" or OS == "linux"', { + ['OS == "mac" or OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 'defines': [ # gtest isn't able to figure out when RTTI is disabled for gcc # versions older than 4.3.2, and assumes it's enabled. Our Mac diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index a6ace12..d1a5708 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -7,7 +7,9 @@ { 'target_defaults': { 'conditions': [ - ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '/linux/']]}], + ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', { + 'sources/': [['exclude', '/linux/']] + }], ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}], ['OS!="win"', {'sources/': [['exclude', '/win/']]}], ], @@ -47,7 +49,7 @@ # # TODO(ajwong): Per the comment above, reduce this conditional's size and # determine if in-tree build in Windows is tractable. - ['(OS!="linux" and OS!="freebsd" and OS!="mac") or use_system_ffmpeg!=0', { + ['(OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="mac") or use_system_ffmpeg!=0', { 'variables': { 'target_for_binaries': 'ffmpeg_binaries', 'ffmpeg_include_root': 'include', @@ -274,7 +276,7 @@ 'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c', ], }], # target_arch=="arm" and ffmpeg_branding=="ChromeOS" - ['OS=="linux" or OS=="freebsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'defines': [ '_ISOC99_SOURCE', '_LARGEFILE_SOURCE', @@ -310,7 +312,7 @@ }], ], }, - }], # OS=="linux" or OS=="freebsd" + }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" ['OS=="mac"', { 'libraries': [ # TODO(ajwong): Move into link_settings when this is fixed: @@ -394,7 +396,7 @@ 'rules': [ { 'conditions': [ - ['OS=="linux" or OS=="freebsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'variables': { 'obj_format': 'elf', }, @@ -512,7 +514,7 @@ 'ffmpegsumo', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'copies': [ { # On Make and Scons builds, the library does not end up in @@ -717,7 +719,7 @@ ], }, 'dependencies': ['../../build/win/system.gyp:cygwin'], - }], ['OS=="linux" or OS=="freebsd"', { + }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'variables': { # TODO(ajwong): Clean this up after we've finished # migrating to in-tree build. diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp index 6d03930..56fa749 100644 --- a/third_party/libevent/libevent.gyp +++ b/third_party/libevent/libevent.gyp @@ -50,7 +50,7 @@ ], }, }], - [ 'OS == "mac" or OS == "freebsd"', { + [ 'OS == "mac" or OS == "freebsd" or OS == "openbsd"', { 'sources': [ 'kqueue.c' ], 'include_dirs': [ 'mac' ] }], diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index b600e75..1af1668 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -28,7 +28,7 @@ 'FEATURE_ENABLE_VOICEMAIL', ], 'conditions': [ - ['OS=="linux" or OS=="mac"', { + ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { 'defines': [ 'POSIX', ], @@ -41,7 +41,7 @@ '../third_party/platformsdk_win2008_6_1/files/Include', ], }], - ['OS=="linux" or OS=="mac"', { + ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { 'defines': [ 'POSIX', ], @@ -272,7 +272,7 @@ 'overrides/talk/base/winsock_initializer.cc', ], }], - ['OS=="linux" or OS=="mac"', { + ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { 'sources': [ 'files/talk/base/unixfilesystem.cc', ], diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index 541f47f..1b28793 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -5,7 +5,9 @@ { 'variables': { 'conditions': [ - ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}], + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + 'os_include': 'linux' + }], ['OS=="mac"', {'os_include': 'mac'}], ['OS=="win"', {'os_include': 'win32'}], ], @@ -15,7 +17,7 @@ { 'target_name': 'libxml', 'conditions': [ - ['(OS=="linux" or OS=="freebsd") and use_system_libxml', { + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_system_libxml', { 'type': 'settings', 'direct_dependent_settings': { 'cflags': [ diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp index 1f62810..ae83817 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -5,7 +5,9 @@ { 'variables': { 'conditions': [ - ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}], + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + 'os_include': 'linux' + }], ['OS=="mac"', {'os_include': 'mac'}], ['OS=="win"', {'os_include': 'win32'}], ], diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp index 0f799f5..afd8ee7 100644 --- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp +++ b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp @@ -45,7 +45,7 @@ ], }, }], - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'type': 'shared_library', 'cflags': ['-fvisibility=hidden'], # -gstabs, used in the official builds, causes an ICE. Simply remove |