bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Don't try to resolve missing package dependencies when use_sysroot==1 (issue #1804)

This commit is contained in:
Marshall Greenblatt 2016-03-10 09:33:21 -08:00
parent e1aa8cc109
commit 77746cfd1b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cef.gyp
View File

@ -12,6 +12,9 @@
# Need to be creative to match dylib version formatting requirements. # Need to be creative to match dylib version formatting requirements.
'version_mac_dylib': 'version_mac_dylib':
'<!(python ../build/util/version.py -f VERSION -f ../chrome/VERSION -t "@CEF_MAJOR@<(commit_number).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")', '<!(python ../build/util/version.py -f VERSION -f ../chrome/VERSION -t "@CEF_MAJOR@<(commit_number).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")',
# For some reason we don't get the 'use_sysroot' default from common.gypi so
# set it here as well.
'use_sysroot%': 0,
}, },
'includes': [ 'includes': [
# Bring in the source file lists. # Bring in the source file lists.
@ -163,7 +166,10 @@
'<@(cefclient_sources_mac)', '<@(cefclient_sources_mac)',
], ],
}], }],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { [ '(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_sysroot==0', {
# Required packages are not available when using the default sysroot
# environment. Consequently the cefclient target cannot be built with
# use_sysroot==1.
'dependencies': [ 'dependencies': [
'gtk', 'gtk',
'gtkglext', 'gtkglext',
@ -1929,7 +1935,10 @@
], ],
}], }],
}], # OS!="mac" }], # OS!="mac"
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { [ '(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_sysroot==0', {
# Required packages are not available when using the default sysroot
# environment. Consequently the cefclient target cannot be built with
# use_sysroot==1.
'targets': [ 'targets': [
{ {
'target_name': 'gtk', 'target_name': 'gtk',
@ -1975,7 +1984,7 @@
}, },
}, },
], ],
}], # OS=="linux" or OS=="freebsd" or OS=="openbsd" }], # (OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_sysroot==0
[ 'OS=="win"', { [ 'OS=="win"', {
'targets': [ 'targets': [
{ {