210280 2020-04-09 08:01:27 -0700 [Tools] jhbuild should respect PKG_CONFIG_PATH 2020-04-10 06:18:02 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aboya aboya bugs-noreply clopez oldest_to_newest 1639643 0 aboya 2020-04-09 08:01:27 -0700 Our jhbuildrc adds the system paths to PKG_CONFIG_PATH. This is not necessary, as they are included implicitly by pkg-config, e.g. $ mkdir /tmp/empty $ PKG_CONFIG_PATH=/tmp/empty pkg-config --cflags glib-2.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include Apart from not being necessary, it is problematic because it makes impossible to override system libraries in jhbuild-wrapper. $ PKG_CONFIG_PATH=/home/ntrrgc/Apps/gst-1.10-prefix/lib/pkgconfig/ jhbuild-wrapper --gtk run bash /webkit/WebKitBuild/DependenciesGTK/Root/lib64/pkgconfig:/webkit/WebKitBuild/DependenciesGTK/Root/lib/pkgconfig:/webkit/WebKitBuild/DependenciesGTK/Root/share/pkgconfig:/usr/share/pkgconfig:/usr/lib64/pkgconfig:/home/ntrrgc/Apps/gst-1.10-prefix/lib/pkgconfig Note /usr/share/pkgconfig and /usr/lib64/pkgconfig are taking priority over the user environment. This patch removes that code, so that the user PKG_CONFIG_PATH takes priority over the system default paths, while these keep having effect too as explained before. $ PKG_CONFIG_PATH=/home/ntrrgc/Apps/gst-1.10-prefix/lib/pkgconfig jhbuild-wrapper --gtk run bash /webkit/WebKitBuild/DependenciesGTK/Root/lib64/pkgconfig:/webkit/WebKitBuild/DependenciesGTK/Root/lib/pkgconfig:/webkit/WebKitBuild/DependenciesGTK/Root/share/pkgconfig:/home/ntrrgc/Apps/gst-1.10-prefix/lib/pkgconfig 1639644 1 395950 aboya 2020-04-09 08:05:15 -0700 Created attachment 395950 Patch 1640140 2 ews-feeder 2020-04-10 06:18:01 -0700 Committed r259867: <https://trac.webkit.org/changeset/259867> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395950. 395950 2020-04-09 08:05:15 -0700 2020-04-10 06:18:02 -0700 Patch bug-210280-20200409170514.patch text/plain 2935 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4OTg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzU3NmE5NTNkMWJhZjYzMDYxOTQzNDhiOWZhNGYzMzlk MjBiMzE1Ny4uMWYyYTNmYjRiMzJhMTI4N2EwYTE3M2E1YmRjYWFkOWViNjRiNTRjOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDIwLTA0LTA5ICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4K KworICAgICAgICBbVG9vbHNdIGpoYnVpbGQgc2hvdWxkIHJlc3BlY3QgUEtHX0NPTkZJR19QQVRI CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyODAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdXIgamhi dWlsZHJjIGFkZHMgdGhlIHN5c3RlbSBwYXRocyB0byBQS0dfQ09ORklHX1BBVEguIFRoaXMgaXMg bm90CisgICAgICAgIG5lY2Vzc2FyeSwgYXMgdGhleSBhcmUgaW5jbHVkZWQgaW1wbGljaXRseSBi eSBwa2ctY29uZmlnLCBlLmcuCisKKyAgICAgICAgJCBta2RpciAvdG1wL2VtcHR5CisgICAgICAg ICQgUEtHX0NPTkZJR19QQVRIPS90bXAvZW1wdHkgcGtnLWNvbmZpZyAtLWNmbGFncyBnbGliLTIu MAorICAgICAgICAtSS91c3IvaW5jbHVkZS9nbGliLTIuMCAtSS91c3IvbGliNjQvZ2xpYi0yLjAv aW5jbHVkZQorCisgICAgICAgIEFwYXJ0IGZyb20gbm90IGJlaW5nIG5lY2Vzc2FyeSwgaXQgaXMg cHJvYmxlbWF0aWMgYmVjYXVzZSBpdCBtYWtlcworICAgICAgICBpbXBvc3NpYmxlIHRvIG92ZXJy aWRlIHN5c3RlbSBsaWJyYXJpZXMgaW4gamhidWlsZC13cmFwcGVyLgorCisgICAgICAgICQgUEtH X0NPTkZJR19QQVRIPS9ob21lL250cnJnYy9BcHBzL2dzdC0xLjEwLXByZWZpeC9saWIvcGtnY29u ZmlnLyBqaGJ1aWxkLXdyYXBwZXIgLS1ndGsgcnVuIGJhc2gKKyAgICAgICAgL3dlYmtpdC9XZWJL aXRCdWlsZC9EZXBlbmRlbmNpZXNHVEsvUm9vdC9saWI2NC9wa2djb25maWc6L3dlYmtpdC9XZWJL aXRCdWlsZC9EZXBlbmRlbmNpZXNHVEsvUm9vdC9saWIvcGtnY29uZmlnOi93ZWJraXQvV2ViS2l0 QnVpbGQvRGVwZW5kZW5jaWVzR1RLL1Jvb3Qvc2hhcmUvcGtnY29uZmlnOi91c3Ivc2hhcmUvcGtn Y29uZmlnOi91c3IvbGliNjQvcGtnY29uZmlnOi9ob21lL250cnJnYy9BcHBzL2dzdC0xLjEwLXBy ZWZpeC9saWIvcGtnY29uZmlnCisKKyAgICAgICAgTm90ZSAvdXNyL3NoYXJlL3BrZ2NvbmZpZyBh bmQgL3Vzci9saWI2NC9wa2djb25maWcgYXJlIHRha2luZyBwcmlvcml0eQorICAgICAgICBvdmVy IHRoZSB1c2VyIGVudmlyb25tZW50LgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVtb3ZlcyB0aGF0 IGNvZGUsIHNvIHRoYXQgdGhlIHVzZXIgUEtHX0NPTkZJR19QQVRIIHRha2VzCisgICAgICAgIHBy aW9yaXR5IG92ZXIgdGhlIHN5c3RlbSBkZWZhdWx0IHBhdGhzLCB3aGlsZSB0aGVzZSBrZWVwIGhh dmluZyBlZmZlY3QKKyAgICAgICAgdG9vIGFzIGV4cGxhaW5lZCBiZWZvcmUuCisKKyAgICAgICAg JCBQS0dfQ09ORklHX1BBVEg9L2hvbWUvbnRycmdjL0FwcHMvZ3N0LTEuMTAtcHJlZml4L2xpYi9w a2djb25maWcgamhidWlsZC13cmFwcGVyIC0tZ3RrIHJ1biBiYXNoCisgICAgICAgIC93ZWJraXQv V2ViS2l0QnVpbGQvRGVwZW5kZW5jaWVzR1RLL1Jvb3QvbGliNjQvcGtnY29uZmlnOi93ZWJraXQv V2ViS2l0QnVpbGQvRGVwZW5kZW5jaWVzR1RLL1Jvb3QvbGliL3BrZ2NvbmZpZzovd2Via2l0L1dl YktpdEJ1aWxkL0RlcGVuZGVuY2llc0dUSy9Sb290L3NoYXJlL3BrZ2NvbmZpZzovaG9tZS9udHJy Z2MvQXBwcy9nc3QtMS4xMC1wcmVmaXgvbGliL3BrZ2NvbmZpZworCisgICAgICAgICogamhidWls ZC9qaGJ1aWxkcmNfY29tbW9uLnB5OgorICAgICAgICAoaW5pdCk6CisKIDIwMjAtMDQtMDcgIEFs aWNpYSBCb3lhIEdhcmPDrWEgIDxhYm95YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtUb29sc10g Rml4IGdkYiBXZWJDb3JlUXVhbGlmaWVkTmFtZVByaW50ZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL2po YnVpbGQvamhidWlsZHJjX2NvbW1vbi5weSBiL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1v bi5weQppbmRleCA2MWRmYTdlYzQ4ZTczZGQ1NzliNDNjOWMyNjk3YjhmODI4NTk0YjUxLi5iYmJk YmYzNjAzOWZiZjdkMzBlYjlmMGQ2NzRiY2M4YTAyZDFhOTJjIDEwMDY0NAotLS0gYS9Ub29scy9q aGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKKysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNf Y29tbW9uLnB5CkBAIC03MSwxMiArNzEsNyBAQCBkZWYgaW5pdChqaGJ1aWxkcmNfZ2xvYmFscywg amhidWlsZF9wbGF0Zm9ybSk6CiAgICAgIyB0byB1c2Ugb25seSB0aGUgcGx1Z2lucyB3ZSBidWls ZCBpbiBKSEJ1aWxkLgogICAgIG9zLmVudmlyb25bJ0dTVF9QTFVHSU5fU1lTVEVNX1BBVEgnXSA9 ICcnCiAKLSAgICAjIFVzZSBzeXN0ZW0gbGlicmFyaWVzIHdoaWxlIGJ1aWxkaW5nLgogICAgIGFk ZHBhdGggPSBqaGJ1aWxkcmNfZ2xvYmFsc1snYWRkcGF0aCddCi0gICAgc3lzdGVtX2xpYmRpcnMg PSBqaGJ1aWxkcmNfZ2xvYmFsc1snc3lzdGVtX2xpYmRpcnMnXQotICAgIGZvciBsaWJkaXIgaW4g c3lzdGVtX2xpYmRpcnM6Ci0gICAgICAgIGFkZHBhdGgoJ1BLR19DT05GSUdfUEFUSCcsIG9zLnBh dGguam9pbihsaWJkaXIsICdwa2djb25maWcnKSkKLSAgICBhZGRwYXRoKCdQS0dfQ09ORklHX1BB VEgnLCBvcy5wYXRoLmpvaW4ob3Muc2VwLCAndXNyJywgJ3NoYXJlJywgJ3BrZ2NvbmZpZycpKQog CiAgICAgcHJlZml4ID0gamhidWlsZHJjX2dsb2JhbHNbJ3ByZWZpeCddCiAgICAgYWRkcGF0aCgn Q01BS0VfUFJFRklYX1BBVEgnLCBwcmVmaXgpCg==