130064 2014-03-10 19:43:26 -0700 [GTK] The jhbuild environment should set CMAKE_PREFIX_PATH and CMAKE_LIBRARY_PATH 2019-07-25 07:05:53 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=197934 P2 Normal --- 1 mrobinson mrobinson cgarcia gustavo pnormand oldest_to_newest 989189 0 mrobinson 2014-03-10 19:43:26 -0700 CMake doesn't always rely on pkgconfig to find dependencies and instead looks in well-known locations on the host system. Since we want the JHBuild dependencies to take precendence over any libraries installed on the host system, we need to force CMake to look first in the JHBuild root. The EFL port already has logic for doing this, so we should move this logic and all other shared logic to jhbuildrc_common.py. 989194 1 226375 mrobinson 2014-03-10 20:04:04 -0700 Created attachment 226375 Patch 989395 2 226375 mrobinson 2014-03-11 08:03:23 -0700 Comment on attachment 226375 Patch Clearing flags on attachment: 226375 Committed r165452: <http://trac.webkit.org/changeset/165452> 989396 3 mrobinson 2014-03-11 08:03:28 -0700 All reviewed patches have been landed. Closing bug. 226375 2014-03-10 20:04:04 -0700 2014-03-11 08:03:23 -0700 Patch bug-130064-20140310200404.patch text/plain 4652 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1Mzg2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2QwZmMyNzg3OTNlNzQ3Y2Q1MjRhNzU1MjcyMjkzMTk5 MmJlOGI4OS4uNjQwODNmZGQwM2NhYzNmNjEyOTYyNzExNGM2Y2M4MjA3MDMyMGJjNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE0LTAzLTEwICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXSBUaGUgamhidWlsZCBlbnZpcm9ubWVudCBzaG91bGQgc2V0IENNQUtF X1BSRUZJWF9QQVRIIGFuZCBDTUFLRV9MSUJSQVJZX1BBVEgKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDA2NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZWZsL2poYnVpbGRyYzogUmVtb3ZlIGR1cGxp Y2F0ZWQgY29kZS4KKyAgICAgICAgKiBndGsvamhidWlsZHJjOiBSZW1vdmUgZHVwbGljYXRlZCBj b2RlLgorICAgICAgICAqIGpoYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weToKKyAgICAgICAgKGlu aXQpOiBNb3ZlIGR1cGxpY2F0ZWQgY29kZSBmcm9tIGpoYnVpbGRyYydzIGFuZCBleHRlbmQgc2V0 dGluZyBDTWFrZSBlbnZpcm9ubWVudCB2YXJpYWJsZXMgdG8KKyAgICAgICAgR1RLKy4gV2UgYWx3 YXlzIHNldCB0aGUgQ01BS0VfTElCUkFSWV9QQVRILCB3aGljaCBzaG91bGQgYmUgaGFybWxlc3Mg Zm9yIEVGTCAzMi1iaXQgc3lzdGVtcy4KKyAgICAgICAgYW5kIGlzIGFwcGFyZW50bHkgbmVjZXNz YXJ5IGZvciBHVEsrLgorCiAyMDE0LTAzLTA5ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25A aWdhbGlhLmNvbT4KIAogICAgICAgICBSdW5HdGtXZWJLaXRHT2JqZWN0RE9NQmluZGluZ3NBUElC cmVha1Rlc3RzIHNob3VsZCBiZSBhZGRlZCB0byB0aGUgQnVpbGRBbmRUZXN0RmFjdG9yeSBub3Qg dGhlIFRlc3RGYWN0b3J5CmRpZmYgLS1naXQgYS9Ub29scy9lZmwvamhidWlsZHJjIGIvVG9vbHMv ZWZsL2poYnVpbGRyYwppbmRleCA3ODI1OTUxMjRhZTE3NWMxMzRiM2U0MjllZDM4YzRiMjcyNjUz NzYxLi5lNGM2MjEzZTU2ZDg1ODQyNjE3MmNkYzBlMjhmMzk4NjIxODc4N2U0IDEwMDY0NAotLS0g YS9Ub29scy9lZmwvamhidWlsZHJjCisrKyBiL1Rvb2xzL2VmbC9qaGJ1aWxkcmMKQEAgLTIyLDMz ICsyMiw3IEBAIHN5cy5wYXRoLmluc2VydCgwLCBvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1l KF9fZmlsZV9fKSwgIi4uL2poYnVpbGQiKSApCiBpbXBvcnQgamhidWlsZHJjX2NvbW1vbgogamhi dWlsZHJjX2NvbW1vbi5pbml0KGdsb2JhbHMoKSwgImVmbCIpIAogCi1pZiAnTlVNQkVSX09GX1BS T0NFU1NPUlMnIGluIG9zLmVudmlyb246Ci0gICAgam9icyA9IG9zLmVudmlyb25bJ05VTUJFUl9P Rl9QUk9DRVNTT1JTJ10KLQotIyBVc2Ugc3lzdGVtIGxpYnJhcmllcyB3aGlsZSBidWlsZGluZy4K LWlmIHVzZV9saWI2NDoKLSAgICBfbGliZGlyID0gJ2xpYjY0JwotZWxzZToKLSAgICBfbGliZGly ID0gJ2xpYicKLWFkZHBhdGgoJ1BLR19DT05GSUdfUEFUSCcsIG9zLnBhdGguam9pbihvcy5zZXAs ICd1c3InLCBfbGliZGlyLCAncGtnY29uZmlnJykpCi1hZGRwYXRoKCdQS0dfQ09ORklHX1BBVEgn LCBvcy5wYXRoLmpvaW4ob3Muc2VwLCAndXNyJywgJ3NoYXJlJywgJ3BrZ2NvbmZpZycpKQotCiBh ZGRwYXRoKCdYREdfREFUQV9ESVJTJywgJy91c3Ivc2hhcmUnKQogYWRkcGF0aCgnWERHX0NPTkZJ R19ESVJTJywgJy9ldGMveGRnJykKIAotYWRkcGF0aCgnQ01BS0VfUFJFRklYX1BBVEgnLCBwcmVm aXgpCi0KLSMgamhidWlsZCBpbnN0YWxscyBsaWJyYXJpZXMgaW50byBsaWI2NC8gYnkgZGVmYXVs dCB3aGVuIGJ1aWxkaW5nIG9uCi0jIDY0LWJpdCBMaW51eCBpbnN0YWxsYXRpb25zLCB3aGlsZSBD TWFrZSBkb2VzIG5vdCBsb29rIGZvciBsaWJyYXJpZXMKLSMgaW4gbGliNjQvIGlmIC9ldGMvZGVi aWFuX3ZlcnNpb24gZXhpc3RzLiBGb3Igbm93IHdlIGp1c3QgcGFzcyB0aGUKLSMgbGliNjQvIGRp cmVjdG9yeSB0byB0aGUgQ01BS0VfTElCUkFSWV9QQVRIIGVudmlyb25tZW50IHZhcmlhYmxlIHRv Ci0jIG1ha2Ugc3VyZSB0aGUgbGlicmFyaWVzIGluc3RhbGxlZCBieSBqaGJ1aWxkIGFyZSBmb3Vu ZCBieSBDTWFrZSBvbgotIyBEZWJpYW4tYmFzZWQgc3lzdGVtcyBhcyB3ZWxsLgotaWYgdXNlX2xp YjY0OgotICAgIGFkZHBhdGgoJ0NNQUtFX0xJQlJBUllfUEFUSCcsIG9zLnBhdGguam9pbihwcmVm aXgsIF9saWJkaXIpKQotCiBwYXJ0aWFsX2J1aWxkID0gRmFsc2UKLQotIyBBdm9pZCBydW50aW1l IGNvbmZsaWN0cyB3aXRoIEdTdHJlYW1lciBzeXN0ZW0td2lkZSBwbHVnaW5zLiBXZSB3YW50Ci0j IHRvIHVzZSBvbmx5IHRoZSBwbHVnaW5zIHdlIGJ1aWxkIGluIEpIQnVpbGQuCi1vcy5lbnZpcm9u WydHU1RfUExVR0lOX1NZU1RFTV9QQVRIJ10gPSAnJwpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL2po YnVpbGRyYyBiL1Rvb2xzL2d0ay9qaGJ1aWxkcmMKaW5kZXggMWUwYmY0YjEwODBhZmIzODY1NjIw YWM0NDUwYmYwZTZlZTU1MzU5Yi4uYzM1ZjQ1MDk1YTdhZjFkOTkxYTQ1MWY3ZTI4NzI3MGUwMDUy YjYyYSAxMDA2NDQKLS0tIGEvVG9vbHMvZ3RrL2poYnVpbGRyYworKysgYi9Ub29scy9ndGsvamhi dWlsZHJjCkBAIC0yNSwxNiArMjUsOSBAQCBfX2d0a190b29sc19kaXJlY3RvcnkgPSBvcy5wYXRo LmFic3BhdGgob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSkKIHN5cy5wYXRoID0gW19fZ3RrX3Rv b2xzX2RpcmVjdG9yeV0gKyBzeXMucGF0aAogaW1wb3J0IGNvbW1vbgogCi1pZiAnTlVNQkVSX09G X1BST0NFU1NPUlMnIGluIG9zLmVudmlyb246Ci0gICAgam9icyA9IG9zLmVudmlyb25bJ05VTUJF Ul9PRl9QUk9DRVNTT1JTJ10KLQogIyBHVEsrIDMuMC4xMiBtaXNzZXMgdGhlIC1sbSBmbGFnIHdo ZW4gbGlua2luZyB0aGUgdGVzdHMuCiBtb2R1bGVfbWFrZWFyZ3NbJ2d0aysnXSA9ICdMREZMQUdT PSItbG0iICcgKyBtYWtlYXJncwogCi0jIEF2b2lkIHJ1bnRpbWUgY29uZmxpY3RzIHdpdGggR1N0 cmVhbWVyIHN5c3RlbS13aWRlIHBsdWdpbnMuIFdlIHdhbnQKLSMgdG8gdXNlIG9ubHkgdGhlIHBs dWdpbnMgd2UgYnVpbGQgaW4gSkhCdWlsZC4KLW9zLmVudmlyb25bJ0dTVF9QTFVHSU5fU1lTVEVN X1BBVEgnXSA9ICcnCi0KICMgV2UgYWx3YXlzIGVuYWJsZSBpbnRyb3NwZWN0aW9uIHNvIHRoYXQg d2UgY2FuIHNuaWZmIG91dCBwcm9ibGVtcyB3aXRoIG91cgogIyBhbm5vdGF0aW9ucyBzb29uZXIg cmF0aGVyIHRoYW4gbGF0ZXIuCiBhdXRvZ2VuYXJncz0nLS1lbmFibGUtaW50cm9zcGVjdGlvbicK ZGlmZiAtLWdpdCBhL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weSBiL1Rvb2xzL2po YnVpbGQvamhidWlsZHJjX2NvbW1vbi5weQppbmRleCAyMGU5OWIzOTYzMWMyMzdlMTdjMjdiNmI5 ZGQ2N2NkZDNlZDMyNWM3Li43MzQzYWU4NDU0NWExNDU4YjhmZWUzNDMxZGM0YmJjMDVhODNmZWU0 IDEwMDY0NAotLS0gYS9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKKysrIGIvVG9v bHMvamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5CkBAIC02MiwzICs2MiwyMyBAQCBkZWYgaW5p dChqaGJ1aWxkcmNfZ2xvYmFscywgcGxhdGZvcm0pOgogCiAgICAgamhidWlsZHJjX2dsb2JhbHNb Im5vbm90aWZ5Il0gPSBUcnVlCiAgICAgamhidWlsZHJjX2dsb2JhbHNbIm5vdHJheWljb24iXSA9 IFRydWUKKworICAgIGlmICdOVU1CRVJfT0ZfUFJPQ0VTU09SUycgaW4gb3MuZW52aXJvbjoKKyAg ICAgICAgamhidWlsZHJjX2dsb2JhbHNbJ2pvYnMnXSA9IG9zLmVudmlyb25bJ05VTUJFUl9PRl9Q Uk9DRVNTT1JTJ10KKworICAgICMgQXZvaWQgcnVudGltZSBjb25mbGljdHMgd2l0aCBHU3RyZWFt ZXIgc3lzdGVtLXdpZGUgcGx1Z2lucy4gV2Ugd2FudAorICAgICMgdG8gdXNlIG9ubHkgdGhlIHBs dWdpbnMgd2UgYnVpbGQgaW4gSkhCdWlsZC4KKyAgICBvcy5lbnZpcm9uWydHU1RfUExVR0lOX1NZ U1RFTV9QQVRIJ10gPSAnJworCisgICAgIyBVc2Ugc3lzdGVtIGxpYnJhcmllcyB3aGlsZSBidWls ZGluZy4KKyAgICBpZiBqaGJ1aWxkcmNfZ2xvYmFsc1sndXNlX2xpYjY0J106CisgICAgICAgIF9s aWJyYXJ5X2RpciA9ICdsaWI2NCcKKyAgICBlbHNlOgorICAgICAgICBfbGlicmFyeV9kaXIgPSAn bGliJworICAgIGFkZHBhdGggPSBqaGJ1aWxkcmNfZ2xvYmFsc1snYWRkcGF0aCddCisgICAgYWRk cGF0aCgnUEtHX0NPTkZJR19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNlcCwgJ3VzcicsIF9saWJy YXJ5X2RpciwgJ3BrZ2NvbmZpZycpKQorICAgIGFkZHBhdGgoJ1BLR19DT05GSUdfUEFUSCcsIG9z LnBhdGguam9pbihvcy5zZXAsICd1c3InLCAnc2hhcmUnLCAncGtnY29uZmlnJykpCisKKyAgICBw cmVmaXggPSBqaGJ1aWxkcmNfZ2xvYmFsc1sncHJlZml4J10KKyAgICBhZGRwYXRoKCdDTUFLRV9Q UkVGSVhfUEFUSCcsIHByZWZpeCkKKyAgICBhZGRwYXRoKCdDTUFLRV9MSUJSQVJZX1BBVEgnLCBv cy5wYXRoLmpvaW4ocHJlZml4LCBfbGlicmFyeV9kaXIpKQo=