Source release v3.5.0
This commit is contained in:
34
third_party/gmock.gyp
vendored
34
third_party/gmock.gyp
vendored
@@ -2,7 +2,20 @@
|
||||
# This is for googletest release 1.8.0
|
||||
{
|
||||
'target_defaults': {
|
||||
'type': 'static_library',
|
||||
# It seems that if one target uses -fPIC, then all targets will need that
|
||||
# flag or else there will be linking errors. PIC means Position Independent
|
||||
# Code and is needed to build the shared library version of liboemrypto.so.
|
||||
# Similarly, -g is all or nothing. It turns on debugging symbols.
|
||||
'cflags': [
|
||||
'-g',
|
||||
'-fPIC',
|
||||
],
|
||||
'cflags_cc': [
|
||||
'-std=gnu++98',
|
||||
],
|
||||
'ldflags': [
|
||||
'-fPIC',
|
||||
],
|
||||
'include_dirs': [
|
||||
'googletest/googlemock',
|
||||
'googletest/googlemock/include',
|
||||
@@ -15,38 +28,25 @@
|
||||
'googletest/googletest/include',
|
||||
],
|
||||
},
|
||||
# These flags silence warnings that appear in gtest/gmock upstream.
|
||||
# We will not maintain a divergent copy of gmock to fix them.
|
||||
'cflags': [
|
||||
# Ignore unknown warning options, to support both gcc & clang at once.
|
||||
'-Wno-unknown-warning-option',
|
||||
],
|
||||
'cflags_cc': [
|
||||
'-Wno-sign-compare',
|
||||
#'-Wno-unused-const-variable',
|
||||
#'-Wno-unused-function',
|
||||
#'-Wno-unused-parameter',
|
||||
#'-Wno-shadow',
|
||||
'-Wno-conversion',
|
||||
'-Wno-sign-conversion',
|
||||
#'-Wno-useless-cast',
|
||||
],
|
||||
},
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'gmock',
|
||||
'type': 'static_library',
|
||||
'sources': [
|
||||
'googletest/googlemock/src/gmock-all.cc',
|
||||
],
|
||||
},
|
||||
{
|
||||
'target_name': 'gmock_main',
|
||||
'type': 'static_library',
|
||||
'sources': [
|
||||
'googletest/googlemock/src/gmock_main.cc',
|
||||
],
|
||||
},
|
||||
{
|
||||
'target_name': 'gtest',
|
||||
'type': 'static_library',
|
||||
'sources': [
|
||||
'googletest/googletest/src/gtest-all.cc',
|
||||
],
|
||||
|
||||
4
third_party/gyp/common.py
vendored
4
third_party/gyp/common.py
vendored
@@ -429,8 +429,10 @@ def GetFlavor(params):
|
||||
return 'netbsd'
|
||||
if sys.platform.startswith('aix'):
|
||||
return 'aix'
|
||||
if sys.platform.startswith('zos'):
|
||||
return 'zos'
|
||||
if sys.platform.startswith('os390'):
|
||||
return 'os390'
|
||||
return 'zos'
|
||||
|
||||
return 'linux'
|
||||
|
||||
|
||||
6
third_party/gyp/generator/make.py
vendored
6
third_party/gyp/generator/make.py
vendored
@@ -240,7 +240,7 @@ quiet_cmd_alink_thin = AR($(TOOLSET)) $@
|
||||
cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
|
||||
|
||||
quiet_cmd_link = LINK($(TOOLSET)) $@
|
||||
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS)
|
||||
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS)
|
||||
|
||||
quiet_cmd_solink = SOLINK($(TOOLSET)) $@
|
||||
cmd_solink = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS) -Wl,DLL
|
||||
@@ -313,7 +313,7 @@ CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
|
||||
CXX.host ?= %(CXX.host)s
|
||||
CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
|
||||
LINK.host ?= %(LINK.host)s
|
||||
LDFLAGS.host ?=
|
||||
LDFLAGS.host ?= $(LDFLAGS_host)
|
||||
AR.host ?= %(AR.host)s
|
||||
|
||||
# Define a dir function that can handle spaces.
|
||||
@@ -2065,7 +2065,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
|
||||
header_params.update({
|
||||
'link_commands': LINK_COMMANDS_ANDROID,
|
||||
})
|
||||
elif flavor == 'os390':
|
||||
elif flavor == 'zos':
|
||||
copy_archive_arguments = '-fPR'
|
||||
makedep_arguments = '-qmakedep=gcc'
|
||||
header_params.update({
|
||||
|
||||
7
third_party/gyp/generator/ninja.py
vendored
7
third_party/gyp/generator/ninja.py
vendored
@@ -1195,7 +1195,10 @@ class NinjaWriter(object):
|
||||
is_executable = spec['type'] == 'executable'
|
||||
# The ldflags config key is not used on mac or win. On those platforms
|
||||
# linker flags are set via xcode_settings and msvs_settings, respectively.
|
||||
env_ldflags = os.environ.get('LDFLAGS', '').split()
|
||||
if self.toolset == 'target':
|
||||
env_ldflags = os.environ.get('LDFLAGS', '').split()
|
||||
elif self.toolset == 'host':
|
||||
env_ldflags = os.environ.get('LDFLAGS_host', '').split()
|
||||
if self.flavor == 'mac':
|
||||
ldflags = self.xcode_settings.GetLdflags(config_name,
|
||||
self.ExpandSpecial(generator_default_variables['PRODUCT_DIR']),
|
||||
@@ -2321,7 +2324,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
|
||||
'copy',
|
||||
description='COPY $in $out',
|
||||
command='%s gyp-win-tool recursive-mirror $in $out' % sys.executable)
|
||||
elif flavor == 'os390':
|
||||
elif flavor == 'zos':
|
||||
master_ninja.rule(
|
||||
'copy',
|
||||
description='COPY $in $out',
|
||||
|
||||
100
third_party/protobuf.gypi
vendored
100
third_party/protobuf.gypi
vendored
@@ -32,35 +32,40 @@
|
||||
],
|
||||
},
|
||||
'target_defaults': {
|
||||
# These flags silence warnings that appear in protobuf upstream.
|
||||
# We will not maintain a divergent copy of protobuf to fix them.
|
||||
'cflags': [
|
||||
# Ignore unknown warning options, to support both gcc & clang at once.
|
||||
'-Wno-unknown-warning-option',
|
||||
# GCC:
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused-local-typedefs',
|
||||
# Clang:
|
||||
'-Wno-unused-const-variable',
|
||||
'-Wno-unused-function',
|
||||
],
|
||||
'cflags_cc': [
|
||||
'-frtti',
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused-const-variable',
|
||||
'-Wno-unused-function',
|
||||
'-Wno-unused-parameter',
|
||||
'-Wno-shadow',
|
||||
'-Wno-tautological-undefined-compare',
|
||||
'-Wno-conversion',
|
||||
'-Wno-useless-cast',
|
||||
],
|
||||
},
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'protobuf_lite',
|
||||
'type': 'static_library',
|
||||
'toolsets': ['target'],
|
||||
# These flags silence warnings that appear in protobuf upstream.
|
||||
# We will not maintain a divergent copy of protobuf to fix them.
|
||||
'cflags=': [
|
||||
# Ignore unknown warning options, to support both gcc & clang at once.
|
||||
'-Wno-unknown-warning-option',
|
||||
# GCC:
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused-local-typedefs',
|
||||
# Clang:
|
||||
'-Wno-unused-const-variable',
|
||||
'-Wno-unused-function',
|
||||
'-std=gnu++98',
|
||||
],
|
||||
'cflags_cc=': [
|
||||
# Ignore unknown warning options, to support both gcc & clang at once.
|
||||
'-Wno-unknown-warning-option',
|
||||
'-Wno-shadow',
|
||||
# GCC:
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused-local-typedefs',
|
||||
'-Wno-ignored-qualifiers',
|
||||
'-Wno-return-type',
|
||||
'-Wno-maybe-uninitialized',
|
||||
# Clang:
|
||||
'-Wno-unused-const-variable',
|
||||
'-Wno-unused-function',
|
||||
'-std=gnu++98',
|
||||
],
|
||||
'sources': [
|
||||
'<@(protobuf_lite_sources)',
|
||||
],
|
||||
@@ -79,6 +84,31 @@
|
||||
'type': 'static_library',
|
||||
'toolsets': ['host'],
|
||||
'includes': ['xcode_host.gypi'], # xcode workaround
|
||||
# These flags silence warnings that appear in protobuf upstream.
|
||||
# We will not maintain a divergent copy of protobuf to fix them.
|
||||
'cflags=': [
|
||||
# Ignore unknown warning options, to support both gcc & clang at once.
|
||||
'-Wno-unknown-warning-option',
|
||||
# GCC:
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused-local-typedefs',
|
||||
# Clang:
|
||||
'-Wno-unused-const-variable',
|
||||
'-Wno-unused-function',
|
||||
'-Wno-maybe-uninitialized',
|
||||
],
|
||||
'cflags_cc=': [
|
||||
# Ignore unknown warning options, to support both gcc & clang at once.
|
||||
'-Wno-unknown-warning-option',
|
||||
'-Wno-shadow',
|
||||
# GCC:
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused-local-typedefs',
|
||||
# Clang:
|
||||
'-Wno-unused-const-variable',
|
||||
'-Wno-unused-function',
|
||||
'-Wno-misleading-indentation',
|
||||
],
|
||||
'sources': [
|
||||
'<@(protobuf_lite_sources)',
|
||||
|
||||
@@ -118,6 +148,30 @@
|
||||
'type': 'executable',
|
||||
'toolsets': ['host'],
|
||||
'includes': ['xcode_host.gypi'], # xcode workaround
|
||||
|
||||
# These flags silence warnings that appear in protobuf upstream.
|
||||
# We will not maintain a divergent copy of protobuf to fix them.
|
||||
'cflags=': [
|
||||
# Ignore unknown warning options, to support both gcc & clang at once.
|
||||
'-Wno-unknown-warning-option',
|
||||
# GCC:
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused-local-typedefs',
|
||||
# Clang:
|
||||
'-Wno-unused-const-variable',
|
||||
'-Wno-unused-function',
|
||||
],
|
||||
'cflags_cc=': [
|
||||
# Ignore unknown warning options, to support both gcc & clang at once.
|
||||
'-Wno-unknown-warning-option',
|
||||
'-Wno-shadow',
|
||||
# GCC:
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused-local-typedefs',
|
||||
# Clang:
|
||||
'-Wno-unused-const-variable',
|
||||
'-Wno-unused-function',
|
||||
],
|
||||
'sources': [
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/code_generator.cc',
|
||||
'<(protobuf_source)/src/google/protobuf/compiler/command_line_interface.cc',
|
||||
|
||||
Reference in New Issue
Block a user