author | Chris Manchester <cmanchester@mozilla.com> |
Wed, 17 Aug 2016 15:02:31 -0700 | |
changeset 310042 | c0e6aae0b93dc05c08f909d809ad78a96944beeb |
parent 310041 | 98bc41e5c777e70f1ae9772032860f2122c7c3b3 |
child 310043 | 7f6047b2bc091d0293c1811d77b73afbd974f3ad |
push id | 30576 |
push user | ryanvm@gmail.com |
push date | Fri, 19 Aug 2016 13:53:39 +0000 |
treeherder | mozilla-central@74f332c38a69 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 1294803 |
milestone | 51.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/build/autoconf/ffi.m4 +++ b/build/autoconf/ffi.m4 @@ -1,32 +1,12 @@ dnl This Source Code Form is subject to the terms of the Mozilla Public dnl License, v. 2.0. If a copy of the MPL was not distributed with this dnl file, You can obtain one at http://mozilla.org/MPL/2.0/. -AC_DEFUN([MOZ_CONFIG_FFI], [ - -MOZ_ARG_ENABLE_BOOL(system-ffi, -[ --enable-system-ffi Use system libffi (located with pkgconfig)], - MOZ_SYSTEM_FFI=1 ) - -if test -n "$MOZ_SYSTEM_FFI"; then - # Vanilla libffi 3.0.9 needs a few patches from upcoming version 3.0.10 - # for non-GCC compilers. - if test -z "$GNU_CC"; then - PKG_CHECK_MODULES(MOZ_FFI, libffi > 3.0.9) - else - PKG_CHECK_MODULES(MOZ_FFI, libffi >= 3.0.9) - fi -fi - -AC_SUBST(MOZ_SYSTEM_FFI) - -]) - AC_DEFUN([MOZ_SUBCONFIGURE_FFI], [ if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then if test "$BUILD_CTYPES" -a -z "$MOZ_SYSTEM_FFI"; then # Run the libffi 'configure' script. ac_configure_args="--disable-shared --enable-static --disable-raw-api" if test "$MOZ_DEBUG"; then ac_configure_args="$ac_configure_args --enable-debug"
new file mode 100644 --- /dev/null +++ b/build/moz.configure/ffi.configure @@ -0,0 +1,15 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +js_option('--with-system-ffi', + help='Use system libffi (located with pkgconfig)') + +use_system_ffi = depends_if('--with-system-ffi')(lambda _: True) + +system_ffi = pkg_check_modules('MOZ_FFI', 'libffi > 3.0.9', use_system_ffi) + +set_config('MOZ_SYSTEM_FFI', system_ffi) +add_old_configure_assignment('MOZ_SYSTEM_FFI', system_ffi)
--- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -229,17 +229,16 @@ def old_configure_options(*options): '--enable-small-chunk-size', '--enable-startup-notification', '--enable-startupcache', '--enable-stdcxx-compat', '--enable-strip', '--enable-synth-pico', '--enable-system-cairo', '--enable-system-extension-dirs', - '--enable-system-ffi', '--enable-system-pixman', '--enable-system-sqlite', '--enable-tasktracer', '--enable-thread-sanitizer', '--enable-trace-logging', '--enable-tree-freetype', '--enable-ui-locale', '--enable-universalchardet',
--- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -1534,21 +1534,16 @@ fi MOZ_ZLIB_CHECK([1.2.3]) if test -n "$ZLIB_IN_MOZGLUE"; then AC_DEFINE(ZLIB_IN_MOZGLUE) fi AC_SUBST(ZLIB_IN_MOZGLUE) dnl ======================================================== -dnl system libffi Support -dnl ======================================================== -MOZ_CONFIG_FFI() - -dnl ======================================================== dnl = dnl = Application dnl = dnl ======================================================== MOZ_ARG_HEADER(Application) dnl ========================================================
--- a/moz.configure +++ b/moz.configure @@ -96,16 +96,18 @@ add_old_configure_assignment('MOZ_DEBUG' include_when('build/moz.configure/toolchain.configure', when='--enable-compile-environment') include_when('build/moz.configure/memory.configure', when='--enable-compile-environment') include_when('build/moz.configure/headers.configure', when='--enable-compile-environment') include_when('build/moz.configure/warnings.configure', when='--enable-compile-environment') +include_when('build/moz.configure/ffi.configure', + when='--enable-compile-environment') @dependable @imports(_from='mozbuild.backend', _import='backends') def build_backends_choices(): return tuple(backends) @deprecated_option('--enable-build-backend', nargs='+',
--- a/old-configure.in +++ b/old-configure.in @@ -2293,21 +2293,16 @@ if test "$MOZ_SYSTEM_PNG" != 1 -a "$CPU_ esac fi fi # SKIP_LIBRARY_CHECKS AC_SUBST(MOZ_PNG_ARM_NEON) dnl ======================================================== -dnl system libffi Support -dnl ======================================================== -MOZ_CONFIG_FFI() - -dnl ======================================================== dnl = dnl = Application dnl = dnl ======================================================== MOZ_ARG_HEADER(Application) ENABLE_SYSTEM_EXTENSION_DIRS=1