Changeset View
Changeset View
Standalone View
Standalone View
lua54/files/patch-src_Makefile
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- src/Makefile.orig 2018-03-12 18:06:03 UTC | |||||
| +++ src/Makefile | |||||
| @@ -35,12 +35,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. | |||||
| @@ -52,6 +53,9 @@ o: $(ALL_O) | |||||
| a: $(ALL_A) | |||||
| +$(LUA_SO): $(CORE_O) $(LIB_O) | |||||
| + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $? | |||||
| + | |||||
andrew_tao173.riddles.org.uk: LDFLAGS already had MYLDFLAGS included in it; don't add it again. | |||||
| $(LUA_A): $(BASE_O) | |||||
| $(AR) $@ $(BASE_O) | |||||
| $(RANLIB) $@ | |||||
| @@ -99,7 +103,7 @@ c89: | |||||
| freebsd: | |||||
| - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE" SYSLIBS="-Wl,-E -lreadline" | |||||
| + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE" SYSLIBS="-Wl,-E" | |||||
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… | |||||
Not Done Inline ActionsIf 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… | |||||
| generic: $(ALL) | |||||
LDFLAGS already had MYLDFLAGS included in it; don't add it again.