Changeset View
Changeset View
Standalone View
Standalone View
files/patch-src__Makefile
| --- src/Makefile.orig 2015-01-05 16:04:52 UTC | --- src/Makefile.orig 2018-06-25 17:46:36 UTC | ||||
| +++ src/Makefile | +++ src/Makefile | ||||
| @@ -6,12 +6,12 @@ | @@ -6,12 +6,13 @@ | ||||
| # Your platform. See PLATS for possible values. | # Your platform. See PLATS for possible values. | ||||
| PLAT= none | PLAT= none | ||||
| -CC= gcc -std=gnu99 | -CC= gcc -std=gnu99 | ||||
| -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) | -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) | ||||
| +CC?= gcc -std=gnu99 | +CC?= gcc -std=gnu99 | ||||
| +CFLAGS= -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) | +CFLAGS= -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) | ||||
| LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) | LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) | ||||
| LIBS= -lm $(SYSLIBS) $(MYLIBS) | LIBS= -lm $(SYSLIBS) $(MYLIBS) | ||||
| +SOLIBS= -lm | |||||
| -AR= ar rcu | -AR= ar rcu | ||||
| +AR= ar | +AR= ar | ||||
| RANLIB= ranlib | RANLIB= ranlib | ||||
| RM= rm -f | RM= rm -f | ||||
| @@ -19,8 +19,8 @@ SYSCFLAGS= | @@ -19,8 +20,8 @@ SYSCFLAGS= | ||||
| SYSLDFLAGS= | SYSLDFLAGS= | ||||
| SYSLIBS= | SYSLIBS= | ||||
| -MYCFLAGS= | -MYCFLAGS= | ||||
| -MYLDFLAGS= | -MYLDFLAGS= | ||||
| +MYCFLAGS?= | +MYCFLAGS?= | ||||
| +MYLDFLAGS?= | +MYLDFLAGS?= | ||||
| MYLIBS= | MYLIBS= | ||||
| MYOBJS= | MYOBJS= | ||||
| @@ -38,12 +38,13 @@ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) | @@ -38,12 +39,13 @@ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) | ||||
| LUA_T= lua | LUA_T= lua | ||||
| LUA_O= lua.o | LUA_O= lua.o | ||||
| +LUA_SO= liblua.so | +LUA_SO= liblua.so | ||||
| LUAC_T= luac | LUAC_T= luac | ||||
| LUAC_O= luac.o | LUAC_O= luac.o | ||||
| ALL_O= $(BASE_O) $(LUA_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) | ||||
| +ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) | +ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) | ||||
| ALL_A= $(LUA_A) | ALL_A= $(LUA_A) | ||||
| # Targets start here. | # Targets start here. | ||||
| @@ -55,8 +56,11 @@ o: $(ALL_O) | @@ -55,8 +57,11 @@ o: $(ALL_O) | ||||
| a: $(ALL_A) | a: $(ALL_A) | ||||
| +$(LUA_SO): $(CORE_O) $(LIB_O) | +$(LUA_SO): $(CORE_O) $(LIB_O) | ||||
| + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $? | + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $? $(SOLIBS) | ||||
| + | + | ||||
| $(LUA_A): $(BASE_O) | $(LUA_A): $(BASE_O) | ||||
| - $(AR) $@ $(BASE_O) | - $(AR) $@ $(BASE_O) | ||||
| + $(AR) $(ARFLAGS) $@ $(BASE_O) | + $(AR) $(ARFLAGS) $@ $(BASE_O) | ||||
| $(RANLIB) $@ | $(RANLIB) $@ | ||||
| $(LUA_T): $(LUA_O) $(LUA_A) | $(LUA_T): $(LUA_O) $(LUA_A) | ||||
russ.haley_gmail.com: This is the simplest way to patch the original make file to compile it on FreeBSD. I don't have… | |||||
Not Done Inline ActionsThis isn't actually needed with the change to use the "bsd" target. andrew_tao173.riddles.org.uk: This isn't actually needed with the change to use the "bsd" target. | |||||
This is the simplest way to patch the original make file to compile it on FreeBSD. I don't have my arm boards handy, but this is essentially what I do when I build lua manually. Again, the changes are applied to the base makefile so the lua sources are as vanilla as possible and the base make system works.