Skip to content

Commit c8974d6

Browse files
targosdanielleadams
targos
authored and
danielleadams
committed
deps: update nghttp2 to 1.52.0
Refs: https://github.com/nghttp2/nghttp2/releases/tag/v1.52.0 PR-URL: #46636 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]>
1 parent 2b439a2 commit c8974d6

File tree

4 files changed

+7
-73
lines changed

4 files changed

+7
-73
lines changed

‎deps/nghttp2/lib/Makefile.in‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,8 @@ host_triplet = @host@
107107
target_triplet = @target@
108108
subdir = lib
109109
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
110-
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
111-
$(top_srcdir)/m4/ax_boost_base.m4 \
112-
$(top_srcdir)/m4/ax_boost_system.m4 \
113-
$(top_srcdir)/m4/ax_boost_thread.m4 \
114-
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
110+
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
115111
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
116-
$(top_srcdir)/m4/ax_python_devel.m4 \
117112
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
118113
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
119114
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
@@ -300,11 +295,6 @@ AUTOCONF = @AUTOCONF@
300295
AUTOHEADER = @AUTOHEADER@
301296
AUTOMAKE = @AUTOMAKE@
302297
AWK = @AWK@
303-
BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
304-
BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
305-
BOOST_LDFLAGS = @BOOST_LDFLAGS@
306-
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
307-
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
308298
BPFCFLAGS = @BPFCFLAGS@
309299
CC = @CC@
310300
CCDEPMODE = @CCDEPMODE@
@@ -321,7 +311,6 @@ CXXCPP = @CXXCPP@
321311
CXXDEPMODE = @CXXDEPMODE@
322312
CXXFLAGS = @CXXFLAGS@
323313
CYGPATH_W = @CYGPATH_W@
324-
CYTHON = @CYTHON@
325314
DEFS = @DEFS@
326315
DEPDIR = @DEPDIR@
327316
DLLTOOL = @DLLTOOL@
@@ -406,15 +395,9 @@ PKG_CONFIG = @PKG_CONFIG@
406395
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
407396
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
408397
PYTHON = @PYTHON@
409-
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
410398
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
411-
PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
412-
PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
413-
PYTHON_LIBS = @PYTHON_LIBS@
414399
PYTHON_PLATFORM = @PYTHON_PLATFORM@
415-
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
416400
PYTHON_PREFIX = @PYTHON_PREFIX@
417-
PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
418401
PYTHON_VERSION = @PYTHON_VERSION@
419402
RANLIB = @RANLIB@
420403
SED = @SED@

‎deps/nghttp2/lib/Makefile.msvc‎

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@
66
# The MIT License apply.
77
#
88

9-
#
10-
# Choose your weapons:
11-
# Set 'USE_CYTHON=1' to build and install the 'nghttp2.pyd' Python extension.
12-
#
139
THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST))
1410

15-
USE_CYTHON := 0
16-
#USE_CYTHON := 1
17-
1811
_VERSION := $(shell grep AC_INIT ../configure.ac | cut -d'[' -f3 | sed -e 's/-DEV//g' -e 's/], //g')
1912
_VERSION := $(subst ., ,$(_VERSION))
2013
VER_MAJOR := $(word 1,$(_VERSION))
@@ -102,7 +95,7 @@ NGHTTP2_OBJ_D := $(addprefix $(OBJ_DIR)/d_, $(notdir $(NGHTTP2_SRC:.c=.obj)))
10295
clean_nghttp2_pyd_0 clean_nghttp2_pyd_1
10396

10497

105-
all: intro includes/nghttp2/nghttp2ver.h $(OBJ_DIR) $(TARGETS) build_nghttp2_pyd_$(USE_CYTHON)
98+
all: intro includes/nghttp2/nghttp2ver.h $(OBJ_DIR) $(TARGETS)
10699
@echo 'Welcome to NgHTTP2 (release + debug).'
107100
@echo 'Do a "make -f Makefile.MSVC install" at own risk!'
108101

@@ -121,7 +114,7 @@ $(OBJ_DIR):
121114

122115
install: includes/nghttp2/nghttp2.h includes/nghttp2/nghttp2ver.h \
123116
$(TARGETS) \
124-
copy_headers_and_libs install_nghttp2_pyd_$(USE_CYTHON)
117+
copy_headers_and_libs
125118

126119
#
127120
# This MUST be done before using the 'install_nghttp2_pyd_1' rule.
@@ -160,31 +153,6 @@ $(DLL_D): $(NGHTTP2_OBJ_D) $(OBJ_DIR)/d_nghttp2.res
160153
WIN_OBJDIR:=$(shell cygpath -w $(abspath $(OBJ_DIR)))
161154
WIN_OBJDIR:=$(subst \,/,$(WIN_OBJDIR))
162155

163-
../python/setup.py: ../python/setup.py.in $(THIS_MAKEFILE)
164-
cd ../python ; \
165-
echo '# $(GENERATED). DO NOT EDIT.' > setup.py ; \
166-
sed -e 's/@top_srcdir@/../' \
167-
-e 's%@top_builddir@%$(WIN_OBJDIR)%' \
168-
-e 's/@PACKAGE_VERSION@/$(VERSION)/' setup.py.in >> setup.py ;
169-
170-
build_nghttp2_pyd_0: ;
171-
172-
build_nghttp2_pyd_1: $(addprefix ../python/, setup.py nghttp2.pyx)
173-
cd ../python ; \
174-
python setup.py build_ext -i -f bdist_wininst
175-
176-
install_nghttp2_pyd_0: ;
177-
178-
install_nghttp2_pyd_1: $(addprefix ../python/, setup.py nghttp2.pyx)
179-
cd ../python ; \
180-
pip install .
181-
182-
clean_nghttp2_pyd_0: ;
183-
184-
clean_nghttp2_pyd_1:
185-
cd ../python ; \
186-
rm -fR build dist
187-
188156
$(OBJ_DIR)/r_%.obj: %.c $(THIS_MAKEFILE)
189157
$(CC) $(CFLAGS_R) $(CFLAGS) -Fo$@ -c $<
190158
@echo
@@ -262,7 +230,7 @@ clean:
262230
rm -f $(OBJ_DIR)/* includes/nghttp2/nghttp2ver.h
263231
@echo
264232

265-
vclean realclean: clean clean_nghttp2_pyd_$(USE_CYTHON)
233+
vclean realclean: clean
266234
- rm -rf $(OBJ_DIR)
267235
- rm -f .depend.MSVC
268236

‎deps/nghttp2/lib/includes/Makefile.in‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,8 @@ host_triplet = @host@
114114
target_triplet = @target@
115115
subdir = lib/includes
116116
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
117-
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_asio.m4 \
118-
$(top_srcdir)/m4/ax_boost_base.m4 \
119-
$(top_srcdir)/m4/ax_boost_system.m4 \
120-
$(top_srcdir)/m4/ax_boost_thread.m4 \
121-
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
117+
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
122118
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
123-
$(top_srcdir)/m4/ax_python_devel.m4 \
124119
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
125120
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
126121
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
@@ -208,11 +203,6 @@ AUTOCONF = @AUTOCONF@
208203
AUTOHEADER = @AUTOHEADER@
209204
AUTOMAKE = @AUTOMAKE@
210205
AWK = @AWK@
211-
BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
212-
BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
213-
BOOST_LDFLAGS = @BOOST_LDFLAGS@
214-
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
215-
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
216206
BPFCFLAGS = @BPFCFLAGS@
217207
CC = @CC@
218208
CCDEPMODE = @CCDEPMODE@
@@ -229,7 +219,6 @@ CXXCPP = @CXXCPP@
229219
CXXDEPMODE = @CXXDEPMODE@
230220
CXXFLAGS = @CXXFLAGS@
231221
CYGPATH_W = @CYGPATH_W@
232-
CYTHON = @CYTHON@
233222
DEFS = @DEFS@
234223
DEPDIR = @DEPDIR@
235224
DLLTOOL = @DLLTOOL@
@@ -314,15 +303,9 @@ PKG_CONFIG = @PKG_CONFIG@
314303
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
315304
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
316305
PYTHON = @PYTHON@
317-
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
318306
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
319-
PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
320-
PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
321-
PYTHON_LIBS = @PYTHON_LIBS@
322307
PYTHON_PLATFORM = @PYTHON_PLATFORM@
323-
PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
324308
PYTHON_PREFIX = @PYTHON_PREFIX@
325-
PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
326309
PYTHON_VERSION = @PYTHON_VERSION@
327310
RANLIB = @RANLIB@
328311
SED = @SED@

‎deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
* @macro
3030
* Version number of the nghttp2 library release
3131
*/
32-
#define NGHTTP2_VERSION "1.51.0"
32+
#define NGHTTP2_VERSION "1.52.0"
3333

3434
/**
3535
* @macro
3636
* Numerical representation of the version number of the nghttp2 library
3737
* release. This is a 24 bit number with 8 bits for major number, 8 bits
3838
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
3939
*/
40-
#define NGHTTP2_VERSION_NUM 0x013300
40+
#define NGHTTP2_VERSION_NUM 0x013400
4141

4242
#endif /* NGHTTP2VER_H */

0 commit comments

Comments
 (0)