summaryrefslogtreecommitdiff
path: root/lang/lua53/files/patch-src_Makefile
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-10-15 17:28:22 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-10-15 17:28:22 +0000
commitd0a0649cdc940991d1841431db82172fd446ad9c (patch)
tree8f01635a5b255b6b74a439c2a079413dd77a9f13 /lang/lua53/files/patch-src_Makefile
parentRemove expired port: devel/geany-plugin-geanypy (diff)
lang/lua53: update to 5.3.6
This release fixes all bugs listed here: https://www.lua.org/bugs.html#5.3.5 While we're here, do some cleanup work in preparation for an impending lang/lua54 port: - Various reordering to appease portclippy - The patch to src/Makefile has been renamed to match the standard naming convention since it was relatively close - Use ${LUA_VER_STR} in place of again writing out the version string - Use various LUA_* substitutions in the plist to reduce change on new versions The latter two have actually been backported from the submitted lua54 port in D14709, rather than being included in the original submission, to make the diff between lang/lua53 and lang/lua54 more obvious. Submitted by: Russ Haley <russ haley gmail com> Submitted with: Andrew Gierth <andrew_tao173 riddles org uk> Differential Revision: https://reviews.freebsd.org/D25797
Notes
Notes: svn path=/head/; revision=552431
Diffstat (limited to 'lang/lua53/files/patch-src_Makefile')
-rw-r--r--lang/lua53/files/patch-src_Makefile58
1 files changed, 58 insertions, 0 deletions
diff --git a/lang/lua53/files/patch-src_Makefile b/lang/lua53/files/patch-src_Makefile
new file mode 100644
index 000000000000..8fd03a43c90e
--- /dev/null
+++ b/lang/lua53/files/patch-src_Makefile
@@ -0,0 +1,58 @@
+--- src/Makefile.orig 2018-06-25 17:46:36 UTC
++++ src/Makefile
+@@ -6,12 +6,13 @@
+ # Your platform. See PLATS for possible values.
+ PLAT= none
+
+-CC= gcc -std=gnu99
+-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
++CC?= gcc -std=gnu99
++CFLAGS= -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)
++SOLIBS= -lm
+
+-AR= ar rcu
++AR= ar
+ RANLIB= ranlib
+ RM= rm -f
+
+@@ -19,8 +20,8 @@ SYSCFLAGS=
+ SYSLDFLAGS=
+ SYSLIBS=
+
+-MYCFLAGS=
+-MYLDFLAGS=
++MYCFLAGS?=
++MYLDFLAGS?=
+ MYLIBS=
+ MYOBJS=
+
+@@ -38,12 +39,13 @@ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+
+ LUA_T= lua
+ LUA_O= lua.o
++LUA_SO= liblua.so
+
+ LUAC_T= luac
+ LUAC_O= luac.o
+
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+
+ # Targets start here.
+@@ -55,8 +57,11 @@ o: $(ALL_O)
+
+ a: $(ALL_A)
+
++$(LUA_SO): $(CORE_O) $(LIB_O)
++ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $? $(SOLIBS)
++
+ $(LUA_A): $(BASE_O)
+- $(AR) $@ $(BASE_O)
++ $(AR) $(ARFLAGS) $@ $(BASE_O)
+ $(RANLIB) $@
+
+ $(LUA_T): $(LUA_O) $(LUA_A)