diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-01 19:24:39 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-01 19:24:39 +0000 |
| commit | c3417b96b30d2bf77cccf960a13d4e920c1dba15 (patch) | |
| tree | 6957462b7b276b1fe8607bfa2b457e002232b6ae /main/lua5.3/lua-5.3-make.patch | |
| parent | 99241c94dbde19b1764a1a86a8f23a1058560d88 (diff) | |
| download | aports-c3417b96b30d2bf77cccf960a13d4e920c1dba15.tar.bz2 aports-c3417b96b30d2bf77cccf960a13d4e920c1dba15.tar.xz | |
main/lua5.3: move to main
Diffstat (limited to 'main/lua5.3/lua-5.3-make.patch')
| -rw-r--r-- | main/lua5.3/lua-5.3-make.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/main/lua5.3/lua-5.3-make.patch b/main/lua5.3/lua-5.3-make.patch new file mode 100644 index 0000000000..3492186072 --- /dev/null +++ b/main/lua5.3/lua-5.3-make.patch @@ -0,0 +1,74 @@ +diff --git a/Makefile b/Makefile +index 7fa91c8..c85ede2 100644 +--- a/Makefile ++++ b/Makefile +@@ -112,3 +112,18 @@ pc: + .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho + + # (end of Makefile) ++ ++# Use libtool for binary installs, etc. ++ ++export V ++export LIBTOOL = ../libtool --quiet --tag=CC ++# See libtool manual about how to set this ++ ++alpine_clean: ++ cd src; $(MAKE) $@ ++ ++alpine_install: ++ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) ++ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN) ++ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) ++ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB) +diff --git a/src/Makefile b/src/Makefile +index 2e7a412..a72f342 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -59,10 +59,10 @@ $(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + +-$(LUA_T): $(LUA_O) $(LUA_A) ++origin$(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + +-$(LUAC_T): $(LUAC_O) $(LUA_A) ++origin$(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + + clean: +@@ -194,4 +194,33 @@ lvm.o: lvm.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \ + lzio.o: lzio.c lprefix.h lua.h luaconf.h llimits.h lmem.h lstate.h \ + lobject.h ltm.h lzio.h + ++ ++export LIBTOOL = ../libtool --quiet --tag=CC ++export LIB_VERSION = 0:0:0 ++ ++# The following rules use libtool for compiling and linking in order to ++# provide shared library support. ++ ++LIB_NAME = liblua.la ++LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) ++ ++%.lo %.o: %.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< ++ ++$(LIB_NAME): $(LIB_OBJS) ++ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) -release $(V) \ ++ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) ++ ++$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) ++ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ \ ++ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) ++ ++$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME) ++ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) \ ++ $(LIB_NAME) ++ ++alpine_clean: ++ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac ++ ++alpine_all: $(LIB_NAME) $(LUA_T) $(LUAC_T) + # (end of Makefile) |