debug 2

build/openresty/patches/LuaJIT-2.1-20210510_03_patch_macro_luajit_version.patch

@@ -0,0 +1,14 @@
+diff --git a/bundle/LuaJIT-2.1-20210510/src/luajit.h b/bundle/LuaJIT-2.1-20210510/src/luajit.h
+index 1dddaec..651de67 100644
+--- a/bundle/LuaJIT-2.1-20210510/src/luajit.h
++++ b/bundle/LuaJIT-2.1-20210510/src/luajit.h
+@@ -32,7 +32,9 @@
+
+ #define OPENRESTY_LUAJIT
+
++#ifndef LUAJIT_VERSION
+ #define LUAJIT_VERSION		"LuaJIT 2.1.0-beta3"
++#endif
+ #define LUAJIT_VERSION_NUM	20100  /* Version 2.1.0 = 02.01.00. */
+ #define LUAJIT_VERSION_SYM	luaJIT_version_2_1_0_beta3
+ #define LUAJIT_COPYRIGHT	"Copyright (C) 2005-2021 Mike Pall"

build/openresty/patches/LuaJIT-2.1-20210510_04_pass_cc_env.patch

@@ -0,0 +1,40 @@
+diff --git a/bundle/LuaJIT-2.1-20210510/src/Makefile b/bundle/LuaJIT-2.1-20210510/src/Makefile
+index 47a21c9..c60b94e 100644
+--- a/bundle/LuaJIT-2.1-20210510/src/Makefile
++++ b/bundle/LuaJIT-2.1-20210510/src/Makefile
+@@ -27,7 +27,8 @@ NODOTABIVER= 51
+ DEFAULT_CC = gcc
+ #
+ # LuaJIT builds as a native 32 or 64 bit binary by default.
+-CC= $(DEFAULT_CC)
++CC?= $(DEFAULT_CC)
++AR?= ar
+ #
+ # 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)
+ TARGET_STCC= $(STATIC_CC)
+ TARGET_DYNCC= $(DYNAMIC_CC)
+ TARGET_LD= $(CROSS)$(CC)
+-TARGET_AR= $(CROSS)ar rcus 2>/dev/null
++TARGET_AR= $(CROSS)$(AR) rcus 2>/dev/null
+ TARGET_STRIP= $(CROSS)strip
+
+ TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib)
+@@ -291,11 +292,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)\"
+-  ifneq (/usr,$(PREFIX))
+-    TARGET_DYNXLDOPTS= -Wl,-rpath,$(TARGET_LIBPATH)
+-  endif
++ifneq (/usr/local,$(LUA_ROOT))
++  TARGET_XCFLAGS+= -DLUA_ROOT=\"$(LUA_ROOT)\"
++endif
++ifneq (/usr,$(PREFIX))
++  TARGET_DYNXLDOPTS= -Wl,-rpath,$(TARGET_LIBPATH)
+ endif
+ endif
+ ifneq (,$(MULTILIB))

build/openresty/patches/nginx-cross-endianness-fix.patch

@@ -0,0 +1,79 @@
+# http://cgit.openembedded.org/meta-openembedded/tree/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch
+From be9970aa16c5142ef814531d74a07990a8e9eb14 Mon Sep 17 00:00:00 2001
+From: Derek Straka <[email protected]>
+Date: Fri, 1 Dec 2017 10:32:29 -0500
+Subject: [PATCH] Allow the overriding of the endianness via the configure flag
+ --with-endian
+
+The existing configure options contain the --with-endian; however, the command
+line flag does not actually function.  It does not set the endianness and it
+appears to do nothing.
+
+Upstream-Status: Pending
+
+Signed-off-by: Derek Straka <[email protected]>
+
+diff --git a/auto/endianness b/auto/endianness
+index 1b552b6..be84487 100644
+--- a/bundle/nginx-1.19.9/endianness
++++ b/bundle/nginx-1.19.9/auto/endianness
+@@ -13,7 +13,13 @@ checking for system byte ordering
+ END
+
+
+-cat << END > $NGX_AUTOTEST.c
++if [ ".$NGX_WITH_ENDIAN" = ".little" ]; then
++    echo " little endian"
++    have=NGX_HAVE_LITTLE_ENDIAN . auto/have
++elif [ ".$NGX_WITH_ENDIAN" = ".big" ]; then
++    echo " big endian"
++else
++    cat << END > $NGX_AUTOTEST.c
+
+ int main(void) {
+     int i = 0x11223344;
+@@ -26,25 +32,26 @@ int main(void) {
+
+ END
+
+-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
+-          -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
++    ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
++              -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
+
+-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
++    eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
+
+-if [ -x $NGX_AUTOTEST ]; then
+-    if $NGX_AUTOTEST >/dev/null 2>&1; then
+-        echo " little endian"
+-        have=NGX_HAVE_LITTLE_ENDIAN . auto/have
+-    else
+-        echo " big endian"
+-    fi
++    if [ -x $NGX_AUTOTEST ]; then
++        if $NGX_AUTOTEST >/dev/null 2>&1; then
++            echo " little endian"
++            have=NGX_HAVE_LITTLE_ENDIAN . auto/have
++        else
++            echo " big endian"
++        fi
+
+-    rm -rf $NGX_AUTOTEST*
++        rm -rf $NGX_AUTOTEST*
+
+-else
+-    rm -rf $NGX_AUTOTEST*
++    else
++        rm -rf $NGX_AUTOTEST*
+
+-    echo
+-    echo "$0: error: cannot detect system byte ordering"
+-    exit 1
++        echo
++        echo "$0: error: cannot detect system byte ordering"
++        exit 1
++    fi
+ fi
+-- 
+2.7.4