Commit 7d973428 authored by Marco Trevisan's avatar Marco Trevisan
Browse files

Bug 1661094: Always define PKGCONF_REQUIRES_PRIVATE. r=froydnj, a=RyanVM 

When configuring without system NSPR the configuration variable
PKGCONF_REQUIRES_PRIVATE isn't ever set, leading to a .pc file that still
contains the @PKGCONF_REQUIRES_PRIVATE@ stub.

Ensure that we always define PKGCONF_REQUIRES_PRIVATE, by setting it to an
empty string in case no system-nsrp is enabled.
In this way, the pkg-config file stub will be always replaced.

Differential Revision: https://phabricator.services.mozilla.com/D88179
parent a26ce122

build/moz.configure/nspr.configure

+4 −2
Original line number Diff line number Diff line
@@ -61,8 +61,10 @@ def nspr_pkg(nspr_pkg): 
        lib_dir=lib_dir,

    )



@depends(nspr_minver, when='--with-system-nspr')

def pkgconf_requires_private(nspr_minver):

@depends('--with-system-nspr', nspr_minver)

def pkgconf_requires_private(system_nspr, nspr_minver):

    if not system_nspr:

        return ''

    return 'Requires.private: %s' % nspr_minver



set_config('PKGCONF_REQUIRES_PRIVATE', pkgconf_requires_private)