dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

"Reverting 14684" - Building NSS libraries. It is causing local compilation failures.

Browse Source 
BUG=

Review URL: https://codereview.chromium.org//11364150

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@14688 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
whesse@google.com
2012-11-08 16:00:02 +00:00
parent f1a782c5f0
commit 677bbd7d29
7 changed files with 0 additions and 1916 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/bin/bin.gypi
-25
View File
@@ -306,9 +306,6 @@
{
'target_name': 'libdart_io',
'type': 'static_library',
'dependencies': [
'nss',
],
'include_dirs': [
'..',
],
@@ -336,28 +333,6 @@
}],
],
},
{
'target_name': 'nss',
'type': 'none',
'dependencies': [
'bin/net/nss.gyp:nss',
'bin/net/nss.gyp:nspr',
'bin/net/nss.gyp:nssckbi',
'bin/net/nss.gyp:nss_static',
'bin/net/ssl.gyp:libssl',
'bin/net/zlib.gyp:zlib',
'bin/net/sqlite.gyp:sqlite',
],
'export_dependent_settings': [
'bin/net/nss.gyp:nss',
'bin/net/nss.gyp:nspr',
'bin/net/nss.gyp:nssckbi',
'bin/net/nss.gyp:nss_static',
'bin/net/ssl.gyp:libssl',
'bin/net/zlib.gyp:zlib',
'bin/net/sqlite.gyp:sqlite',
],
},
{
'target_name': 'libdart_withcore',
'type': 'static_library',
runtime/bin/net/nss.gyp
-1273
View File
File diff suppressed because it is too large Load Diff
runtime/bin/net/os_linux.S
-11
View File
@@ -1,11 +0,0 @@
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
#ifdef __i386__
#include "../../../third_party/nss/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s"
#elif defined(__x86_64__)
#include "../../../third_party/nss/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s"
#endif
runtime/bin/net/sqlite.gyp
-203
View File
@@ -1,203 +0,0 @@
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
# This file is a modified copy of Chromium's src/third_party/sqlite/sqlite.gyp.
# Revision 165464 (this should agree with "nss_rev" in DEPS).
{
# Added by Dart. All Dart comments refer to the following block or line.
'includes': [
'../../tools/gyp/runtime-configurations.gypi',
'../../tools/gyp/nss_configurations.gypi',
],
'variables': {
# Added by Dart.
'sqlite_directory': '../../../third_party/sqlite',
'use_system_sqlite%': 0,
'required_sqlite_version': '3.6.1',
},
'target_defaults': {
'defines': [
'SQLITE_CORE',
'SQLITE_ENABLE_BROKEN_FTS2',
'SQLITE_ENABLE_FTS2',
'SQLITE_ENABLE_FTS3',
# Disabled by Dart: An external module with advanced unicode functions.
# 'SQLITE_ENABLE_ICU',
'SQLITE_ENABLE_MEMORY_MANAGEMENT',
'SQLITE_SECURE_DELETE',
'THREADSAFE',
'_HAS_EXCEPTIONS=0',
],
},
'targets': [
{
'target_name': 'sqlite',
'conditions': [
[ 'chromeos==1' , {
'defines': [
# Despite obvious warnings about not using this flag
# in deployment, we are turning off sync in ChromeOS
# and relying on the underlying journaling filesystem
# to do error recovery properly. It's much faster.
'SQLITE_NO_SYNC',
],
},
],
['use_system_sqlite', {
'type': 'none',
'direct_dependent_settings': {
'defines': [
'USE_SYSTEM_SQLITE',
],
},
'conditions': [
['OS == "ios"', {
'link_settings': {
'libraries': [
'$(SDKROOT)/usr/lib/libsqlite3.dylib',
],
},
}],
['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
'direct_dependent_settings': {
'cflags': [
# 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)',
],
},
'link_settings': {
'ldflags': [
'<!@(pkg-config --libs-only-L --libs-only-other sqlite3)',
],
'libraries': [
'<!@(pkg-config --libs-only-l sqlite3)',
],
},
}],
],
}, { # !use_system_sqlite
'product_name': 'sqlite3',
'type': 'static_library',
# Changed by Dart: '<(sqlite_directory)/' added to all paths.
'sources': [
'<(sqlite_directory)/amalgamation/sqlite3.h',
'<(sqlite_directory)/amalgamation/sqlite3.c',
# fts2.c currently has a lot of conflicts when added to
# the amalgamation. It is probably not worth fixing that.
'<(sqlite_directory)/src/ext/fts2/fts2.c',
'<(sqlite_directory)/src/ext/fts2/fts2.h',
'<(sqlite_directory)/src/ext/fts2/fts2_hash.c',
'<(sqlite_directory)/src/ext/fts2/fts2_hash.h',
'<(sqlite_directory)/src/ext/fts2/fts2_icu.c',
'<(sqlite_directory)/src/ext/fts2/fts2_porter.c',
'<(sqlite_directory)/src/ext/fts2/fts2_tokenizer.c',
'<(sqlite_directory)/src/ext/fts2/fts2_tokenizer.h',
'<(sqlite_directory)/src/ext/fts2/fts2_tokenizer1.c',
],
# TODO(shess): Previously fts1 and rtree files were
# explicitly excluded from the build. Make sure they are
# logically still excluded.
# TODO(shess): Should all of the sources be listed and then
# excluded? For editing purposes?
'include_dirs': [
'<(sqlite_directory)/amalgamation',
# Needed for fts2 to build.
'<(sqlite_directory)/src/src',
],
'dependencies': [
# Disabled by Dart.
# '../icu/icu.gyp:icui18n',
# Disabled by Dart.
# '../icu/icu.gyp:icuuc',
],
'direct_dependent_settings': {
'include_dirs': [
'<(sqlite_directory)/.',
'<(sqlite_directory)/../..',
],
},
'msvs_disabled_warnings': [
4018, 4244,
],
'conditions': [
['OS=="linux"', {
'link_settings': {
'libraries': [
'-ldl',
],
},
}],
['OS == "android"', {
'defines': [
'HAVE_USLEEP=1',
'SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576',
'SQLITE_DEFAULT_AUTOVACUUM=1',
'SQLITE_TEMP_STORE=3',
'SQLITE_ENABLE_FTS3_BACKWARDS',
'DSQLITE_DEFAULT_FILE_FORMAT=4',
],
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'cflags': [
# SQLite doesn't believe in compiler warnings,
# preferring testing.
# http://www.sqlite.org/faq.html#q17
'-Wno-int-to-pointer-cast',
'-Wno-pointer-to-int-cast',
],
}],
['clang==1', {
'xcode_settings': {
'WARNING_CFLAGS': [
# sqlite does `if (*a++ && *b++);` in a non-buggy way.
'-Wno-empty-body',
# sqlite has some `unsigned < 0` checks.
'-Wno-tautological-compare',
],
},
'cflags': [
'-Wno-empty-body',
'-Wno-tautological-compare',
],
}],
],
}],
],
},
],
'conditions': [
['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and not use_system_sqlite', {
'targets': [
{
'target_name': 'sqlite_shell',
'type': 'executable',
'dependencies': [
# Disabled by Dart.
# '../icu/icu.gyp:icuuc',
'sqlite',
],
'sources': [
'<(sqlite_directory)/src/src/shell.c',
'<(sqlite_directory)/src/src/shell_icu_linux.c',
],
'link_settings': {
'link_languages': ['c++'],
},
},
],
},]
],
}
runtime/bin/net/ssl.gyp
-165
View File
@@ -1,165 +0,0 @@
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
# This file is a modified copy of Chromium's src/net/third_party/nss/ssl.gyp.
# Revision 165464 (this should agree with "nss_rev" in DEPS).
{
# Conditions section for ssl-bodge (Compiling SSL on linux using system
# NSS and NSPR libraries) removed:
# 'conditions': [
# [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
# ...
# }]],
# Added by Dart. All Dart comments refer to the following block or line.
'includes': [
'../../tools/gyp/runtime-configurations.gypi',
'../../tools/gyp/nss_configurations.gypi',
],
# Added by Dart.
'variables': {
'ssl_directory': '../../../third_party/net_nss',
'os_posix': 0,
},
'targets': [
{
'target_name': 'libssl',
'type': 'static_library',
# Changed by Dart: '<(ssl_directory)/' added to all paths.
'sources': [
'<(ssl_directory)/ssl/authcert.c',
'<(ssl_directory)/ssl/cmpcert.c',
'<(ssl_directory)/ssl/derive.c',
'<(ssl_directory)/ssl/dtls1con.c',
'<(ssl_directory)/ssl/nsskea.c',
'<(ssl_directory)/ssl/os2_err.c',
'<(ssl_directory)/ssl/os2_err.h',
'<(ssl_directory)/ssl/preenc.h',
'<(ssl_directory)/ssl/prelib.c',
'<(ssl_directory)/ssl/ssl.h',
'<(ssl_directory)/ssl/ssl3con.c',
'<(ssl_directory)/ssl/ssl3ecc.c',
'<(ssl_directory)/ssl/ssl3ext.c',
'<(ssl_directory)/ssl/ssl3gthr.c',
'<(ssl_directory)/ssl/ssl3prot.h',
'<(ssl_directory)/ssl/sslauth.c',
'<(ssl_directory)/ssl/sslcon.c',
'<(ssl_directory)/ssl/ssldef.c',
'<(ssl_directory)/ssl/sslenum.c',
'<(ssl_directory)/ssl/sslerr.c',
'<(ssl_directory)/ssl/sslerr.h',
'<(ssl_directory)/ssl/SSLerrs.h',
'<(ssl_directory)/ssl/sslerrstrs.c',
'<(ssl_directory)/ssl/sslgathr.c',
'<(ssl_directory)/ssl/sslimpl.h',
'<(ssl_directory)/ssl/sslinfo.c',
'<(ssl_directory)/ssl/sslinit.c',
'<(ssl_directory)/ssl/sslmutex.c',
'<(ssl_directory)/ssl/sslmutex.h',
'<(ssl_directory)/ssl/sslnonce.c',
'<(ssl_directory)/ssl/sslplatf.c',
'<(ssl_directory)/ssl/sslproto.h',
'<(ssl_directory)/ssl/sslreveal.c',
'<(ssl_directory)/ssl/sslsecur.c',
'<(ssl_directory)/ssl/sslsnce.c',
'<(ssl_directory)/ssl/sslsock.c',
'<(ssl_directory)/ssl/sslt.h',
'<(ssl_directory)/ssl/ssltrace.c',
'<(ssl_directory)/ssl/sslver.c',
'<(ssl_directory)/ssl/unix_err.c',
'<(ssl_directory)/ssl/unix_err.h',
'<(ssl_directory)/ssl/win32err.c',
'<(ssl_directory)/ssl/win32err.h',
],
'sources!': [
'<(ssl_directory)/ssl/os2_err.c',
'<(ssl_directory)/ssl/os2_err.h',
],
'defines': [
'NSS_ENABLE_ECC',
'NSS_ENABLE_ZLIB',
'USE_UTIL_DIRECTLY',
],
'defines!': [
# Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet.
'NO_NSPR_10_SUPPORT',
],
'dependencies': [
'zlib.gyp:zlib',
# Dart: Start of copy of code from 'bodge' conditions section below.
'nss.gyp:nspr',
'nss.gyp:nss',
],
'export_dependent_settings': [
'nss.gyp:nspr',
'nss.gyp:nss',
],
'direct_dependent_settings': {
'include_dirs': [
'<(ssl_directory)/ssl',
],
'defines': [
'NSS_PLATFORM_CLIENT_AUTH',
],
# Dart: End of copy of code from bodge conditions section.
},
'msvs_disabled_warnings': [4018, 4244],
'conditions': [
[ 'clang == 1', {
'cflags': [
# See http://crbug.com/138571#c8. In short, sslsecur.c picks up the
# system's cert.h because cert.h isn't in chromium's repo.
'-Wno-incompatible-pointer-types',
],
}],
# Added by Dart.
[ 'OS == "linux"', {
'defines': [
'XP_UNIX',
'NSS_PLATFORM_CLIENT_AUTH',
'NSS_USE_STATIC_LIBS',
],
}],
[ 'OS == "mac" or OS == "ios"', {
'defines': [
'XP_UNIX',
'DARWIN',
'XP_MACOSX',
],
}],
[ 'OS == "win"', {
'sources!': [
'<(ssl_directory)/ssl/unix_err.c',
'<(ssl_directory)/ssl/unix_err.h',
],
},
{ # else: OS != "win"
'sources!': [
'<(ssl_directory)/ssl/win32err.c',
'<(ssl_directory)/ssl/win32err.h',
],
},
],
# Dart: Conditions sections for ssl/bodge removed.
# [ 'os_posix == 1 and OS != "mac" and OS != "ios", {
# ...
# ],
# [ 'OS == "mac" or OS == "ios" or OS == "win"', {
# ...
# ],
],
'configurations': {
'Debug_Base': {
'defines': [
'DEBUG',
],
},
},
},
],
}
runtime/bin/net/zlib.gyp
-167
View File
@@ -1,167 +0,0 @@
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
# This file is a modified copy of src/third_party/zlib/zlib.gyp from Chromium.
# Revision 165464 (this should agree with "nss_rev" in DEPS).
{
# Added by Dart. All Dart comments refer to the following block or line.
'includes': [
'../../tools/gyp/runtime-configurations.gypi',
'../../tools/gyp/nss_configurations.gypi',
],
'variables': {
# Added by Dart.
'zlib_path': '../../../third_party/zlib',
'conditions': [
[ 'OS=="none"', {
# Because we have a patched zlib, we cannot use the system libz.
# TODO(pvalchev): OpenBSD is purposefully left out, as the system
# zlib brings up an incompatibility that breaks rendering.
'use_system_zlib%': 1,
}, {
'use_system_zlib%': 0,
}],
],
'use_system_minizip%': 0,
},
'targets': [
{
'target_name': 'zlib',
'type': 'static_library',
'conditions': [
['use_system_zlib==0', {
# Changed by Dart: '<(zlib_directory)/' added to all paths.
'sources': [
'<(zlib_path)/adler32.c',
'<(zlib_path)/compress.c',
'<(zlib_path)/crc32.c',
'<(zlib_path)/crc32.h',
'<(zlib_path)/deflate.c',
'<(zlib_path)/deflate.h',
'<(zlib_path)/gzio.c',
'<(zlib_path)/infback.c',
'<(zlib_path)/inffast.c',
'<(zlib_path)/inffast.h',
'<(zlib_path)/inffixed.h',
'<(zlib_path)/inflate.c',
'<(zlib_path)/inflate.h',
'<(zlib_path)/inftrees.c',
'<(zlib_path)/inftrees.h',
'<(zlib_path)/mozzconf.h',
'<(zlib_path)/trees.c',
'<(zlib_path)/trees.h',
'<(zlib_path)/uncompr.c',
'<(zlib_path)/zconf.h',
'<(zlib_path)/zlib.h',
'<(zlib_path)/zutil.c',
'<(zlib_path)/zutil.h',
],
'include_dirs': [
'<(zlib_path)/.',
],
'direct_dependent_settings': {
'include_dirs': [
'<(zlib_path)/.',
],
},
'conditions': [
['OS!="win"', {
'product_name': 'chrome_zlib',
}], ['OS=="android"', {
'toolsets': ['target', 'host'],
}],
],
}, {
'direct_dependent_settings': {
'defines': [
'USE_SYSTEM_ZLIB',
],
},
'defines': [
'USE_SYSTEM_ZLIB',
],
'link_settings': {
'libraries': [
'-lz',
],
},
}],
],
},
{
'target_name': 'minizip',
'type': 'static_library',
'conditions': [
['use_system_minizip==0', {
'sources': [
'<(zlib_path)/contrib/minizip/ioapi.c',
'<(zlib_path)/contrib/minizip/ioapi.h',
'<(zlib_path)/contrib/minizip/iowin32.c',
'<(zlib_path)/contrib/minizip/iowin32.h',
'<(zlib_path)/contrib/minizip/unzip.c',
'<(zlib_path)/contrib/minizip/unzip.h',
'<(zlib_path)/contrib/minizip/zip.c',
'<(zlib_path)/contrib/minizip/zip.h',
],
'include_dirs': [
'<(zlib_path)/.',
'<(zlib_path)/../..',
],
'direct_dependent_settings': {
'include_dirs': [
'<(zlib_path)/.',
],
},
'conditions': [
['OS!="win"', {
'sources!': [
'<(zlib_path)/contrib/minizip/iowin32.c'
],
}],
['OS=="android"', {
'toolsets': ['target', 'host'],
}],
],
}, {
'direct_dependent_settings': {
'defines': [
'USE_SYSTEM_MINIZIP',
],
},
'defines': [
'USE_SYSTEM_MINIZIP',
],
'link_settings': {
'libraries': [
'-lminizip',
],
},
}],
['OS=="mac" or OS=="ios" or os_bsd==1 or OS=="android"', {
# Mac, Android and the BSDs don't have fopen64, ftello64, or
# fseeko64. We use fopen, ftell, and fseek instead on these
# systems.
'defines': [
'USE_FILE32API'
],
}],
['clang==1', {
'xcode_settings': {
'WARNING_CFLAGS': [
# zlib uses `if ((a == b))` for some reason.
'-Wno-parentheses-equality',
],
},
'cflags': [
'-Wno-parentheses-equality',
],
}],
],
}
],
}
runtime/tools/gyp/nss_configurations.gypi
-72
View File
@@ -1,72 +0,0 @@
# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
# This file is included to modify the configurations to build third-party
# code from Mozilla's NSS and NSPR libraries, modified by the Chromium project.
# This code is C code, not C++, and is not warning-free, so we need to remove
# C++-specific flags, and add flags to supress the warnings in the code.
# This file is included from gyp files in the runtime/bin/net directory.
{
'variables': {
# Used by third_party/nss, which is from Chromium.
'os_posix': 1,
'os_bsd': 0,
'chromeos': 0,
'clang': 0,
},
'target_defaults': {
'cflags': [
'-Wno-unused-variable',
'-Wno-unused-but-set-variable',
'-Wno-missing-field-initializers',
'-Wno-uninitialized',
'-Wno-sign-compare',
'-Wno-empty-body',
'-Wno-type-limits',
'-Wno-pointer-to-int-cast',
'-UHAVE_CVAR_BUILT_ON_SEM',
],
# Removes these flags from the list cflags.
'cflags!': [
# NSS code from upstream mozilla builds with warnings,
# so we must allow warnings without failing.
'-Werror',
'-Wall',
'-ansi',
# Not supported for C, only for C++.
'-Wnon-virtual-dtor',
'-Wno-conversion-null',
'-fno-rtti',
'-fvisibility-inlines-hidden',
'-Woverloaded-virtual',
],
'configurations': {
'Dart_Base': {
'xcode_settings': {
'WARNING_CFLAGS!': [
'-Wall',
'-Wextra',
],
},
},
# Dart_Debug and Dart_Release are merged after Dart_Base, so we can
# override the 'ansi' and '-Werror' flags set at the global level in
# tools/gyp/configurations_xcode.gypi.
'Dart_Debug': {
'xcode_settings': {
# Remove 'ansi' setting.
'GCC_C_LANGUAGE_STANDARD': 'c99',
'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off
},
},
'Dart_Release': {
'xcode_settings': {
# Remove 'ansi' setting.
'GCC_C_LANGUAGE_STANDARD': 'c99',
'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off
},
},
},
},
}