| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 1 | From 734ab2f7879c6f94fc18ea6a10adb9bd156ba769 Mon Sep 17 00:00:00 2001 |
| 2 | From: Venture Research <tech@ventureresearch.com> |
| 3 | Date: Fri, 8 Feb 2013 20:22:19 -0600 |
| 4 | Subject: [PATCH] lua: update Makefile to use environment build settings |
| 5 | |
| 6 | OE-specific parameters, instead of overriding all of these simply use |
| 7 | the ones that are already passed in. Also configure for only Linux... |
| 8 | |
| 9 | Signed-off-by: Venture Research <tech@ventureresearch.com> |
| 10 | |
| 11 | Updated to work with 3.0.x |
| 12 | |
| 13 | Signed-off-by: Armin Kuster <akust808@gmail.com> |
| 14 | |
| 15 | updated to work wtih 6.2.1 |
| 16 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> |
| 17 | |
| 18 | --- |
| Patrick Williams | 520786c | 2023-06-25 16:20:36 -0500 | [diff] [blame] | 19 | Upstream-Status: Pending |
| 20 | |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 21 | deps/Makefile | 1 - |
| 22 | deps/lua/Makefile | 1 - |
| 23 | deps/lua/src/Makefile | 16 ++++++---------- |
| 24 | 3 files changed, 6 insertions(+), 12 deletions(-) |
| 25 | |
| 26 | diff --git a/deps/Makefile b/deps/Makefile |
| 27 | index 8592e17..1807af5 100644 |
| 28 | --- a/deps/Makefile |
| 29 | +++ b/deps/Makefile |
| 30 | @@ -81,7 +81,6 @@ endif |
| 31 | # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more |
| 32 | # challenging to cross-compile lua (and redis). These defines make it easier |
| 33 | # to fit redis into cross-compilation environments, which typically set AR. |
| 34 | -AR=ar |
| 35 | ARFLAGS=rc |
| 36 | |
| 37 | lua: .make-prerequisites |
| 38 | diff --git a/deps/lua/Makefile b/deps/lua/Makefile |
| 39 | index 209a132..72f4b2b 100644 |
| 40 | --- a/deps/lua/Makefile |
| 41 | +++ b/deps/lua/Makefile |
| 42 | @@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644 |
| 43 | |
| 44 | # Utilities. |
| 45 | MKDIR= mkdir -p |
| 46 | -RANLIB= ranlib |
| 47 | |
| 48 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= |
| 49 | |
| 50 | diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile |
| 51 | index f3bba2f..1555ec0 100644 |
| 52 | --- a/deps/lua/src/Makefile |
| 53 | +++ b/deps/lua/src/Makefile |
| 54 | @@ -5,18 +5,14 @@ |
| 55 | # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= |
| 56 | |
| 57 | # Your platform. See PLATS for possible values. |
| 58 | -PLAT= none |
| 59 | +PLAT= linux |
| 60 | |
| 61 | -CC?= gcc |
| 62 | -CFLAGS= -O2 -Wall $(MYCFLAGS) |
| 63 | -AR= ar rcu |
| 64 | -RANLIB= ranlib |
| 65 | -RM= rm -f |
| 66 | -LIBS= -lm $(MYLIBS) |
| 67 | - |
| 68 | -MYCFLAGS= |
| 69 | +MYCFLAGS=-DLUA_USE_LINUX |
| 70 | MYLDFLAGS= |
| 71 | -MYLIBS= |
| 72 | +MYLIBS=-Wl,-E -ldl -lreadline -lhistory -lncurses |
| 73 | + |
| 74 | +CFLAGS += $(MYCFLAGS) |
| 75 | +LIBS += -lm $(MYLIBS) |
| 76 | |
| 77 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= |
| 78 | |