Bug 1295784 - Use the argument name for `when` when passing it to Python configure's pkg_check_modules. r=glandium
authorChris Manchester <cmanchester@mozilla.com>
Wed, 17 Aug 2016 15:02:31 -0700
changeset 310045 1f16e23b6885127c1fa4c849b3af48fe2e9264a6
parent 310044 aa9e6ab2f1456657f0cb661b5f5067b91ea9a8d3
child 310046 00ff86931c76da6621263e459e6b2f2669a836e3
push id30576
push userryanvm@gmail.com
push dateFri, 19 Aug 2016 13:53:39 +0000
treeherdermozilla-central@74f332c38a69 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1295784
milestone51.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
Bug 1295784 - Use the argument name for `when` when passing it to Python configure's pkg_check_modules. r=glandium MozReview-Commit-ID: GcVEzS3nLql
build/moz.configure/ffi.configure
moz.configure
toolkit/moz.configure
--- a/build/moz.configure/ffi.configure
+++ b/build/moz.configure/ffi.configure
@@ -4,17 +4,18 @@
 # 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)
+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)
 
 @depends(building_js, '--help')
 def ctypes_default(building_js, _):
     return not building_js
 
--- a/moz.configure
+++ b/moz.configure
@@ -242,17 +242,17 @@ check_prog('RPMBUILD', delayed_getattr(e
 option('--enable-system-hunspell',
        help="Use system hunspell (located with pkgconfig)")
 
 @depends('--enable-system-hunspell', compile_environment)
 def check_for_hunspell(value, compile_env):
     return value and compile_env
 
 system_hunspell = pkg_check_modules('MOZ_HUNSPELL', 'hunspell',
-                                    check_for_hunspell)
+                                    when=check_for_hunspell)
 
 set_config('MOZ_SYSTEM_HUNSPELL', system_hunspell)
 
 
 @depends(target)
 @imports('os')
 def makensis_progs(target):
     if target.kernel != 'WINNT':
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -448,17 +448,18 @@ def check_places_and_android_history(pla
 # ==============================================================
 option('--enable-gpsd', env='MOZ_GPSD',
        help='Enable gpsd support')
 
 @depends('--enable-gpsd')
 def gpsd(value):
     return bool(value)
 
-system_gpsd = pkg_check_modules('MOZ_GPSD', 'libgps >= 3.11', gpsd)
+system_gpsd = pkg_check_modules('MOZ_GPSD', 'libgps >= 3.11',
+                                when=gpsd)
 
 set_config('MOZ_GPSD', system_gpsd)
 
 # Miscellaneous programs
 # ==============================================================
 
 check_prog('TAR', ('gnutar', 'gtar', 'tar'))
 check_prog('UNZIP', ('unzip',))