176887 2017-09-13 18:24:53 -0700 [CMake] Find Nghttp2 2022-05-27 12:47:21 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 don.olmstead don.olmstead achristensen annulen bfulgham lforschler pvollan yoshiaki.jitsukawa oldest_to_newest 1348600 0 don.olmstead 2017-09-13 18:24:53 -0700 WinCairo plans to use nghttp2 once curl is updated in the requirements. 1348601 1 320720 don.olmstead 2017-09-13 18:28:37 -0700 Created attachment 320720 Patch Support detection of nghttp2 1348660 2 320720 achristensen 2017-09-13 23:21:18 -0700 Comment on attachment 320720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320720&action=review > Source/cmake/FindNghttp2.cmake:52 > + file(READ "${NGHTTP2_INCLUDE_DIRS}/nghttp2ver.h" _nghttp2_version_content) > + > + string(REGEX MATCH "#define +NGHTTP2_VERSION +\"([0-9]+\.[0-9]+\.[0-9]+)\"" _dummy "${_nghttp2_version_content}") > + set(NGHTTP2_VERSION "${CMAKE_MATCH_1}") It would be nice to not do this every time we run CMake. Why will we need this value from within CMake? Can't we just detect it in headers or require a certain version? 1348709 3 320720 annulen 2017-09-14 03:00:01 -0700 Comment on attachment 320720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320720&action=review >> Source/cmake/FindNghttp2.cmake:52 >> + set(NGHTTP2_VERSION "${CMAKE_MATCH_1}") > > It would be nice to not do this every time we run CMake. Why will we need this value from within CMake? Can't we just detect it in headers or require a certain version? Certainly, this code should be run only once. One way to do this is to save result in cache variable. However, I don't see that we make use of this version variable. So it should be enough to pass PC_NGHTTP2_VERSION instead like most our modules do, and if pkg-config is not used it will be undefined. 320720 2017-09-13 18:28:37 -0700 2017-09-14 10:43:34 -0700 Patch bug-176887.diff text/plain 3285 don.olmstead ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA5NmM3Y2VkODcwYy4uNDI0 YjQ0NmNiZmIgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMiBAQAorMjAxNy0wOS0xMyAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29t PgorCisgICAgICAgIFtDTWFrZV0gRmluZCBOZ2h0dHAyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY4ODcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNvdXJjZS9jbWFrZS9GaW5kTmdodHRwMi5jbWFr ZTogQWRkZWQuCisKIDIwMTctMDktMDcgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpA aWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXVtDTWFrZV0gQWRkICJkaXN0IiBhbmQgImRpc3Rj aGVjayIgdGFyZ2V0cwpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL0ZpbmROZ2h0dHAyLmNtYWtl IGIvU291cmNlL2NtYWtlL0ZpbmROZ2h0dHAyLmNtYWtlCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwLi5jZGZiNTgxZjY4YwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9j bWFrZS9GaW5kTmdodHRwMi5jbWFrZQpAQCAtMCwwICsxLDYzIEBACisjIC0gVHJ5IHRvIGZpbmQg bmdodHRwMgorIyBUaGlzIG1vZHVsZSBkZWZpbmVzIHRoZSBmb2xsb3dpbmcgdmFyaWFibGVzOgor IworIyAgTkdIVFRQMl9GT1VORCAtIG5naHR0cDIgMi40IHdhcyBmb3VuZAorIyAgTkdIVFRQMl9J TkNMVURFX0RJUlMgLSB0aGUgbmdodHRwMiAyLjQgaW5jbHVkZSBkaXJlY3RvcmllcworIyAgTkdI VFRQMl9MSUJSQVJJRVMgLSBsaW5rIHRoZXNlIHRvIHVzZSBuZ2h0dHAyCisjCisjIENvcHlyaWdo dCAoQykgMjAxNyBTb255IEludGVyYWN0aXZlIEVudGVydGFpbm1lbnQgSW5jLgorIworIyBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor IyAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyMgICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisjCisj IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVIgQU5EIElU UyBDT05UUklCVVRPUlMgYGBBUworIyBJUycnIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorIyBUSEUgSU1QTElFRCBX QVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFS CisjIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklH SFQgSE9MREVSIE9SIElUUworIyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyMgRVhFTVBMQVJZLCBPUiBDT05TRVFV RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorIyBQUk9DVVJF TUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwg T1IgUFJPRklUUzsKKyMgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBB TkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksCisjIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNU UklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SCisjIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYKKyMgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisK K2ZpbmRfcGFja2FnZShQa2dDb25maWcpCitwa2dfY2hlY2tfbW9kdWxlcyhQQ19OR0hUVFAyIFFV SUVUIG5naHR0cDIpCisKK2ZpbmRfcGF0aChOR0hUVFAyX0lOQ0xVREVfRElSUworICAgIE5BTUVT IG5naHR0cDIuaAorICAgIEhJTlRTICR7UENfTkdIVFRQMl9JTkNMVURFRElSfQorICAgICAgICAg ICR7UENfTkdIVFRQMl9JTkNMVURFX0RJUlN9CisgICAgUEFUSF9TVUZGSVhFUyBuZ2h0dHAyCisp CisKK2ZpbmRfbGlicmFyeShOR0hUVFAyX0xJQlJBUklFUworICAgIE5BTUVTIG5naHR0cDIKKyAg ICBISU5UUyAke1BDX05HSFRUUDJfTElCRElSfQorICAgICAgICAgICR7UENfTkdIVFRQMl9MSUJS QVJZX0RJUlN9CispCisKK2lmIChOR0hUVFAyX0lOQ0xVREVfRElSUykKKyAgICBpZiAoRVhJU1RT ICIke05HSFRUUDJfSU5DTFVERV9ESVJTfS9uZ2h0dHAydmVyLmgiKQorICAgICAgICBmaWxlKFJF QUQgIiR7TkdIVFRQMl9JTkNMVURFX0RJUlN9L25naHR0cDJ2ZXIuaCIgX25naHR0cDJfdmVyc2lv bl9jb250ZW50KQorCisgICAgICAgIHN0cmluZyhSRUdFWCBNQVRDSCAiI2RlZmluZSArTkdIVFRQ Ml9WRVJTSU9OICtcIihbMC05XStcLlswLTldK1wuWzAtOV0rKVwiIiBfZHVtbXkgIiR7X25naHR0 cDJfdmVyc2lvbl9jb250ZW50fSIpCisgICAgICAgIHNldChOR0hUVFAyX1ZFUlNJT04gIiR7Q01B S0VfTUFUQ0hfMX0iKQorICAgIGVuZGlmICgpCitlbmRpZiAoKQorCitpbmNsdWRlKEZpbmRQYWNr YWdlSGFuZGxlU3RhbmRhcmRBcmdzKQorZmluZF9wYWNrYWdlX2hhbmRsZV9zdGFuZGFyZF9hcmdz KE5HSFRUUDIgUkVRVUlSRURfVkFSUyBOR0hUVFAyX0lOQ0xVREVfRElSUyBOR0hUVFAyX0xJQlJB UklFUworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVkVSU0lPTl9W QVIgTkdIVFRQMl9WRVJTSU9OKQorCittYXJrX2FzX2FkdmFuY2VkKAorICAgIE5HSFRUUDJfSU5D TFVERV9ESVJTCisgICAgTkdIVFRQMl9MSUJSQVJJRVMKKykK