Page MenuHomeFreeBSD
Differential D14709 Diff 63431 lua54/files/patch-src_Makefile

Changeset View

Standalone View

View Options

lua54/files/patch-src_Makefile

PropertyOld ValueNew Value
fbsd:nokeywordsnullyes
\ No newline at end of property
svn:eol-stylenullnative
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
--- src/Makefile.orig 2019-10-16 04:56:41 UTC
+++ src/Makefile
@@ -35,12 +35,12 @@ 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.
@@ -53,9 +53,12 @@ o: $(ALL_O)
a: $(ALL_A)
$(LUA_A): $(BASE_O)
- $(AR) $@ $(BASE_O)
+ $(AR) $(ARFLAGS) $@ $(BASE_O)
$(RANLIB) $@
andrew_tao173.riddles.org.ukUnsubmitted
Not Done
Inline Actions

LDFLAGS already had MYLDFLAGS included in it; don't add it again.

andrew_tao173.riddles.org.uk: LDFLAGS already had MYLDFLAGS included in it; don't add it again.
+$(LUA_SO): $(CORE_O) $(LIB_O)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $? $(SOLIBS)
+
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
andrew_tao173.riddles.org.ukUnsubmitted
Not Done
Inline Actions

If you're going to remove -lreadline here, it seems more logical to also remove -DLUA_USE_READLINE and pass that in via MYCFLAGS. This has the advantage that you can make it an option for the port (on by default).

andrew_tao173.riddles.org.uk: If you're going to remove -lreadline here, it seems more logical to also remove…
andrew_tao173.riddles.org.ukUnsubmitted
Done
Inline Actions

-DLUA_USE_READLINE definitely needs to be removed from here now, the EDITNONE option of the port breaks if it's left in. (Sorry, forgot to mention that when I sent the makefile changes.)

andrew_tao173.riddles.org.uk: -DLUA_USE_READLINE definitely needs to be removed from here now, the EDITNONE option of the…