-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7031bb0
commit c49d4b3
Showing
8 changed files
with
715 additions
and
0 deletions.
There are no files selected for viewing
14 changes: 14 additions & 0 deletions
14
build/openresty/patches/LuaJIT-2.1-20210510_03_patch_macro_luajit_version.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" |
40 changes: 40 additions & 0 deletions
40
build/openresty/patches/LuaJIT-2.1-20210510_04_pass_cc_env.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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)) |
Oops, something went wrong.