diff options
| -rw-r--r-- | build/common.gypi | 14 | ||||
| -rwxr-xr-x | build/install-build-deps.sh | 6 | ||||
| -rw-r--r-- | build/linux/system.gyp | 14 | ||||
| -rw-r--r-- | third_party/bzip2/bzip2.gyp | 9 | ||||
| -rw-r--r-- | third_party/libjpeg/libjpeg.gyp | 9 | ||||
| -rw-r--r-- | third_party/libpng/libpng.gyp | 9 | ||||
| -rw-r--r-- | third_party/libxslt/libxslt.gyp | 7 | ||||
| -rw-r--r-- | third_party/zlib/zlib.gyp | 9 |
8 files changed, 25 insertions, 52 deletions
diff --git a/build/common.gypi b/build/common.gypi index ece3401..0f42c37 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -44,6 +44,20 @@ # hosts should pass an explicit target_arch to gyp. 'target_arch%': '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/arm.*/arm/")', + + # On Linux, we use the system versions of several libraries. We end + # up pulling these in as .so's anyway since they are already in our + # transitive closure due to GTK. + 'use_system_zlib': 1, + 'use_system_libjpeg': 1, + 'use_system_bzip2': 1, + 'use_system_libpng': 1, + 'use_system_libjpeg': 1, + 'use_system_libxslt': 1, + + # We use our own copy of libssl, although we still need to link + # against the rest of NSS. + 'use_system_ssl': 0, }, { # OS!="linux" 'target_arch%': 'ia32', }], diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index f675db7..02bff1d 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -111,9 +111,9 @@ fi # Packages need for development dev_list="apache2 bison fakeroot flex g++ g++-multilib gperf libapache2-mod-php5 libasound2-dev libcairo2-dev libgconf2-dev libglib2.0-dev - libgtk2.0-dev libjpeg62-dev libnspr4-dev libnss3-dev libsqlite3-dev - libxslt1-dev lighttpd msttcorefonts patch perl php5-cgi pkg-config - python rpm subversion wdiff" + libgtk2.0-dev libnspr4-dev libnss3-dev libsqlite3-dev lighttpd + msttcorefonts patch perl php5-cgi pkg-config python rpm subversion + wdiff" # Full list of required run-time libraries lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libexpat1 diff --git a/build/linux/system.gyp b/build/linux/system.gyp index c51d0a7..a707343 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -13,19 +13,11 @@ 'pkg-config': 'pkg-config' }, }], - [ 'OS=="linux"', { - 'variables': { - # We use our own copy of libssl, although we still need to link against - # the rest of NSS. - 'use_system_ssl%': 0, - }, - }, { # OS!="linux" - 'variables': { - 'use_system_ssl%': 1, - }, - }], ], + 'variables': { + 'use_system_ssl%': 1, + }, 'targets': [ { diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp index c0f36e0..8bf3b31 100644 --- a/third_party/bzip2/bzip2.gyp +++ b/third_party/bzip2/bzip2.gyp @@ -4,14 +4,7 @@ { 'variables': { - 'conditions': [ - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_bzip2%': 1, - }, { # OS!="linux" - 'use_system_bzip2%': 0, - }], - ], + 'use_system_bzip2%': 0, }, 'conditions': [ ['use_system_bzip2==0', { diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp index 1b0798b..c0259d6 100644 --- a/third_party/libjpeg/libjpeg.gyp +++ b/third_party/libjpeg/libjpeg.gyp @@ -4,14 +4,7 @@ { 'variables': { - 'conditions': [ - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_libjpeg%': 1, - }, { # OS!="linux" - 'use_system_libjpeg%': 0, - }], - ], + 'use_system_libjpeg%': 0, }, 'conditions': [ ['use_system_libjpeg==0', { diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 1387b18..6093d5f 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -4,14 +4,7 @@ { 'variables': { - 'conditions': [ - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_libpng%': 1, - }, { # OS!="linux" - 'use_system_libpng%': 0, - }], - ], + 'use_system_libpng%': 0, }, 'conditions': [ ['use_system_libpng==0', { diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp index 4a8f812..1f62810 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -8,13 +8,8 @@ ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}], ['OS=="mac"', {'os_include': 'mac'}], ['OS=="win"', {'os_include': 'win32'}], - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_libxslt%': 1, - }, { # OS!="linux" - 'use_system_libxslt%': 0, - }], ], + 'use_system_libxslt%': 0, }, 'targets': [ { diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index 36613a7..44e1f8b 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -4,14 +4,7 @@ { 'variables': { - 'conditions': [ - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_zlib%': 1, - }, { # OS!="linux" - 'use_system_zlib%': 0, - }], - ], + 'use_system_zlib%': 0, }, 'conditions': [ ['use_system_zlib==0', { |