chromium/src
0
Fork 0
Code Activity

OpenBSD/FreeBSD GYP changes (most of the remaining ones)

Browse Source 
Review URL: http://codereview.chromium.org/565043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38079 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
pvalchev@google.com
2010-02-04 04:19:35 +00:00
parent f6dc8961a5
commit 60b2c071b1
20 changed files with 169 additions and 47 deletions

12
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'
}

4
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:

6
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': [

4
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 {

2
printing/pdf_ps_metafile_linux.cc → 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>

6
printing/pdf_ps_metafile_linux.h → 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_

2
printing/pdf_ps_metafile_linux_unittest.cc → 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>

0
printing/printed_document_linux.cc → printing/printed_document_cairo.cc

24
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': [

0
printing/printing_context_linux.cc → printing/printing_context_cairo.cc

113
sdch/bsd/config.h Normal file

@ -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 */

1
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' ] } ],
],

4
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',

2
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

16
third_party/ffmpeg/ffmpeg.gyp vendored

@ -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.

2
third_party/libevent/libevent.gyp vendored

@ -50,7 +50,7 @@
],
},
}],
[ 'OS == "mac" or OS == "freebsd"', {
[ 'OS == "mac" or OS == "freebsd" or OS == "openbsd"', {
'sources': [ 'kqueue.c' ],
'include_dirs': [ 'mac' ]
}],

6
third_party/libjingle/libjingle.gyp vendored

@ -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',
],

6
third_party/libxml/libxml.gyp vendored

@ -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': [

4
third_party/libxslt/libxslt.gyp vendored

@ -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'}],
],

2
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