Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests(templates): remove listen http2 (DO NOT MERGE) #12342

Closed
wants to merge 17 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .requirements
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
KONG_PACKAGE_NAME=kong

OPENRESTY=1.21.4.3
OPENRESTY=1.25.3.1
LUAROCKS=3.9.2
OPENSSL=3.2.0
PCRE=8.45
Expand Down

This file was deleted.

26 changes: 0 additions & 26 deletions build/openresty/patches/LuaJIT-2.1-20230410_03_arm64_sigill.patch

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/bundle/LuaJIT-2.1-20231117/src/luajit_rolling.h b/bundle/LuaJIT-2.1-20231117/src/luajit_rolling.h
index f082974..d16d66b 100644
--- a/bundle/LuaJIT-2.1-20231117/src/luajit_rolling.h
+++ b/bundle/LuaJIT-2.1-20231117/src/luajit_rolling.h
@@ -32,7 +32,9 @@

#define OPENRESTY_LUAJIT

+#ifndef LUAJIT_VERSION
#define LUAJIT_VERSION "LuaJIT 2.1.ROLLING"
+#endif
#define LUAJIT_VERSION_NUM 20199 /* Deprecated. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_ROLLING
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2023 Mike Pall"
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/bundle/LuaJIT-2.1-20230410/src/Makefile b/bundle/LuaJIT-2.1-20230410/src/Makefile
index 68a9a7c..8d2de33 100644
--- a/bundle/LuaJIT-2.1-20230410/src/Makefile
+++ b/bundle/LuaJIT-2.1-20230410/src/Makefile
@@ -27,7 +27,8 @@ NODOTABIVER= 51
diff --git a/bundle/LuaJIT-2.1-20231117/src/Makefile b/bundle/LuaJIT-2.1-20231117/src/Makefile
index d80e45a..f87762e 100644
--- a/bundle/LuaJIT-2.1-20231117/src/Makefile
+++ b/bundle/LuaJIT-2.1-20231117/src/Makefile
@@ -26,7 +26,8 @@ NODOTABIVER= 51
DEFAULT_CC = gcc
#
# LuaJIT builds as a native 32 or 64 bit binary by default.
Expand All @@ -12,18 +12,18 @@ index 68a9a7c..8d2de33 100644
#
# Use this if you want to force a 32 bit build on a 64 bit multilib OS.
#CC= $(DEFAULT_CC) -m32
@@ -211,7 +212,7 @@ TARGET_CC= $(STATIC_CC)
@@ -210,7 +211,7 @@ TARGET_CC= $(STATIC_CC)
TARGET_STCC= $(STATIC_CC)
TARGET_DYNCC= $(DYNAMIC_CC)
TARGET_LD= $(CROSS)$(CC)
-TARGET_AR= $(CROSS)ar rcus
+TARGET_AR= $(CROSS)$(AR) rcus
TARGET_STRIP= $(CROSS)strip

TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib)
@@ -291,11 +292,11 @@ TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH))
@@ -290,11 +291,11 @@ TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH))
TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH))

ifneq (,$(PREFIX))
-ifneq (/usr/local,$(PREFIX))
- TARGET_XCFLAGS+= -DLUA_ROOT=\"$(PREFIX)\"
Expand Down
Loading
Loading