diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-16 20:15:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-16 20:21:38 (GMT) |
| commit | 1ca53784cae82bd3025f8a8f2ffc08665d3a35e1 (patch) | |
| tree | 939e614d50cdf9356fa3e8c9403865d470dd54b0 /Utilities/Scripts | |
| parent | bfca444b92f6b1eb5db81ac17aafcd8241b94419 (diff) | |
| download | CMake-1ca53784cae82bd3025f8a8f2ffc08665d3a35e1.zip CMake-1ca53784cae82bd3025f8a8f2ffc08665d3a35e1.tar.gz CMake-1ca53784cae82bd3025f8a8f2ffc08665d3a35e1.tar.bz2 | |
nghttp2: Update import script to fix version header
In commit 66c9536775 (nghttp2: Update script to get nghttp2 1.50.0,
2022-10-31, v3.26.0-rc1~455^2~2) we forgot to update the `nghttp2ver.h`
replacements to provide the proper `NGHTTP2_VERSION_NUM`. This causes
our build of curl to think it is using a different version of nghttp2
than we provide. Fix the version and add a reminder comment.
Issue: #24419
Diffstat (limited to 'Utilities/Scripts')
| -rwxr-xr-x | Utilities/Scripts/update-nghttp2.bash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/Scripts/update-nghttp2.bash b/Utilities/Scripts/update-nghttp2.bash index bc76377..db2094e 100755 --- a/Utilities/Scripts/update-nghttp2.bash +++ b/Utilities/Scripts/update-nghttp2.bash @@ -8,7 +8,7 @@ readonly name="nghttp2" readonly ownership="nghttp2 upstream <kwrobot@kitware.com>" readonly subtree="Utilities/cmnghttp2" readonly repo="https://github.com/nghttp2/nghttp2.git" -readonly tag="v1.50.0" +readonly tag="v1.50.0" # When updating, sync PACKAGE_VERSION below! readonly shortlog=false readonly paths=" COPYING @@ -23,7 +23,7 @@ extract_source () { pushd "${extractdir}/${name}-reduced" echo "* -whitespace" > .gitattributes mv lib/includes/nghttp2/nghttp2ver.h.in lib/includes/nghttp2/nghttp2ver.h - sed -i 's/@PACKAGE_VERSION@/1.40.0/;s/@PACKAGE_VERSION_NUM@/0x012800/' lib/includes/nghttp2/nghttp2ver.h + sed -i 's/@PACKAGE_VERSION@/1.50.0/;s/@PACKAGE_VERSION_NUM@/0x013200/' lib/includes/nghttp2/nghttp2ver.h popd } |