summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/lua-5.1.4/0100-Add-lua-support-to-ptxdist-1.99-remove-old-Makefile.patch4
-rw-r--r--patches/lua-5.1.4/0101-Add-lua-support-to-ptxdist-1.99-add-autoconf-files.patch8
-rw-r--r--patches/lua-5.1.4/0102-Add-lua-support-to-ptxdist-1.99-add-automake-files.patch20
3 files changed, 17 insertions, 15 deletions
diff --git a/patches/lua-5.1.4/0100-Add-lua-support-to-ptxdist-1.99-remove-old-Makefile.patch b/patches/lua-5.1.4/0100-Add-lua-support-to-ptxdist-1.99-remove-old-Makefile.patch
index ebc551739..09118c104 100644
--- a/patches/lua-5.1.4/0100-Add-lua-support-to-ptxdist-1.99-remove-old-Makefile.patch
+++ b/patches/lua-5.1.4/0100-Add-lua-support-to-ptxdist-1.99-remove-old-Makefile.patch
@@ -11,8 +11,8 @@ This part of the patch removes the old Makefile.
Signed-off-by: Erwin Rol <erwin@erwinrol.com>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
- Makefile | 128 --------------------------------------------------------------
- 1 files changed, 0 insertions(+), 128 deletions(-)
+ Makefile | 128 ---------------------------------------------------------------
+ 1 file changed, 128 deletions(-)
delete mode 100644 Makefile
diff --git a/Makefile b/Makefile
diff --git a/patches/lua-5.1.4/0101-Add-lua-support-to-ptxdist-1.99-add-autoconf-files.patch b/patches/lua-5.1.4/0101-Add-lua-support-to-ptxdist-1.99-add-autoconf-files.patch
index 40ca10742..f27a62e88 100644
--- a/patches/lua-5.1.4/0101-Add-lua-support-to-ptxdist-1.99-add-autoconf-files.patch
+++ b/patches/lua-5.1.4/0101-Add-lua-support-to-ptxdist-1.99-add-autoconf-files.patch
@@ -11,10 +11,10 @@ This part of the patch adds the autoconf files.
Signed-off-by: Erwin Rol <erwin@erwinrol.com>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
- configure.ac | 70 ++++
- etc/lua.pc.in | 32 ++
- src/luaconf.h.template.in | 777 +++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 879 insertions(+), 0 deletions(-)
+ configure.ac | 70 +++++
+ etc/lua.pc.in | 32 ++
+ src/luaconf.h.template.in | 777 ++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 879 insertions(+)
create mode 100644 configure.ac
create mode 100644 etc/lua.pc.in
create mode 100644 src/luaconf.h.template.in
diff --git a/patches/lua-5.1.4/0102-Add-lua-support-to-ptxdist-1.99-add-automake-files.patch b/patches/lua-5.1.4/0102-Add-lua-support-to-ptxdist-1.99-add-automake-files.patch
index 6e9d6b179..a2b6c4aae 100644
--- a/patches/lua-5.1.4/0102-Add-lua-support-to-ptxdist-1.99-add-automake-files.patch
+++ b/patches/lua-5.1.4/0102-Add-lua-support-to-ptxdist-1.99-add-automake-files.patch
@@ -11,12 +11,12 @@ This part of the patch adds the automake files.
Signed-off-by: Erwin Rol <erwin@erwinrol.com>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
- Makefile.am | 5 +++++
- doc/Makefile.am | 5 +++++
- etc/Makefile.am | 8 ++++++++
- src/Makefile.am | 45 +++++++++++++++++++++++++++++++++++++++++++++
- test/Makefile.am | 5 +++++
- 5 files changed, 68 insertions(+), 0 deletions(-)
+ Makefile.am | 5 +++++
+ doc/Makefile.am | 5 +++++
+ etc/Makefile.am | 8 ++++++++
+ src/Makefile.am | 47 +++++++++++++++++++++++++++++++++++++++++++++++
+ test/Makefile.am | 5 +++++
+ 5 files changed, 70 insertions(+)
create mode 100644 Makefile.am
create mode 100644 doc/Makefile.am
create mode 100644 etc/Makefile.am
@@ -61,17 +61,17 @@ index 0000000..23edd92
+ luavs.bat min.c README
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
-index 0000000..81dfde9
+index 0000000..cf6bdea
--- /dev/null
+++ b/src/Makefile.am
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,47 @@
+AM_CFLAGS = -Wall
+
+include_HEADERS = lua.h lualib.h lauxlib.h
+nodist_include_HEADERS = luaconf.h
+
+lib_LTLIBRARIES = liblua.la
-+liblua_la_LDFLAGS = -release @VERSION@
++liblua_la_LDFLAGS = -release @VERSION@ -Wl,--as-needed
+liblua_la_SOURCES = \
+ lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c \
+ lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c \
@@ -82,6 +82,8 @@ index 0000000..81dfde9
+ lobject.h lstate.h ltm.h lundump.h lcode.h lfunc.h llimits.h lopcodes.h \
+ lstring.h lvm.h
+
++liblua_la_LIBADD = @LUA_LIBS@
++
+bin_PROGRAMS = lua luac
+
+lua_SOURCES = lua.c