Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset c0e6aae0b93d (bug 1294803) for breaking artifact builds.

Browse Source 
MozReview-Commit-ID: BTrQMCJSCRn
This commit is contained in:
Chris Manchester 2016-08-19 11:12:07 -07:00
parent 65ba8ff0f6
commit 76d8f148d9
6 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/autoconf/ffi.m4
View File

@ -2,6 +2,26 @@ 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

16
build/moz.configure/ffi.configure
View File

@ -1,16 +0,0 @@
# -*- 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',
when=use_system_ffi)
set_config('MOZ_SYSTEM_FFI', system_ffi)
add_old_configure_assignment('MOZ_SYSTEM_FFI', system_ffi)

1
build/moz.configure/old.configure
View File

@ -233,6 +233,7 @@ def old_configure_options(*options):
'--enable-synth-pico',
'--enable-system-cairo',
'--enable-system-extension-dirs',
'--enable-system-ffi',
'--enable-system-pixman',
'--enable-system-sqlite',
'--enable-tasktracer',

5
js/src/old-configure.in
View File

@ -1538,6 +1538,11 @@ if test -n "$ZLIB_IN_MOZGLUE"; then
fi
AC_SUBST(ZLIB_IN_MOZGLUE)
dnl ========================================================
dnl system libffi Support
dnl ========================================================
MOZ_CONFIG_FFI()
dnl ========================================================
dnl =
dnl = Application

2
moz.configure
View File

@ -101,8 +101,6 @@ 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')

5
old-configure.in
View File

@ -2310,6 +2310,11 @@ fi # SKIP_LIBRARY_CHECKS
AC_SUBST(MOZ_PNG_ARM_NEON)
dnl ========================================================
dnl system libffi Support
dnl ========================================================
MOZ_CONFIG_FFI()
dnl ========================================================
dnl =
dnl = Application