diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 | ||||
| -rwxr-xr-x | build/install-build-deps.sh | 6 | ||||
| -rw-r--r-- | build/linux/system.gyp | 14 |
3 files changed, 14 insertions, 20 deletions
diff --git a/build/common.gypi b/build/common.gypi index 0f42c37..ece3401 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -44,20 +44,6 @@ # 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 02bff1d..f675db7 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 libnspr4-dev libnss3-dev libsqlite3-dev lighttpd - msttcorefonts patch perl php5-cgi pkg-config python rpm subversion - wdiff" + 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" # 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 a707343..c51d0a7 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -13,11 +13,19 @@ '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': [ { |