From a2fa4f5ec85201d7aa2721594a66d9171c0e6dd1 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Oct 2013 10:13:45 +0200 Subject: Import existing patch. diff --git a/Makefile b/Makefile index bd9515f..22d3a62 100644 --- a/Makefile +++ b/Makefile @@ -36,12 +36,12 @@ RM= rm -f # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= # Convenience platforms targets. -PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris +PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris # What to install. TO_BIN= lua luac TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a +TO_LIB= liblua.a liblua.so TO_MAN= lua.1 luac.1 # Lua version and release. diff --git a/src/Makefile b/src/Makefile index 8c9ee67..507632b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,9 +26,10 @@ MYOBJS= # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= -PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris +PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris LUA_A= liblua.a +LUA_SO= liblua.so CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ ltm.o lundump.o lvm.o lzio.o @@ -43,7 +44,7 @@ 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. @@ -65,6 +66,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) $(LUAC_T): $(LUAC_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) +$(LUA_SO): $(CORE_O) $(LIB_O) + $(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS) + clean: $(RM) $(ALL_T) $(ALL_O) @@ -102,6 +106,9 @@ freebsd: generic: $(ALL) +haiku: + $(MAKE) all SYSCFLAGS="-DLUA_USE_HAIKU" LIBS= + linux: $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -lncurses" diff --git a/src/luaconf.h b/src/luaconf.h index e4335df..107b864 100644 --- a/src/luaconf.h +++ b/src/luaconf.h @@ -40,6 +40,13 @@ +#if defined(LUA_USE_HAIKU) +#define LUA_USE_MKSTEMP +#define LUA_USE_ISATTY +#define LUA_USE_POPEN +#define LUA_USE_DLOPEN +#endif + #if defined(LUA_USE_LINUX) #define LUA_USE_POSIX #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ -- 1.8.3.4 From ccb35be40296d43903e01fdd01d2e53cd017b615 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Oct 2013 10:25:23 +0200 Subject: Set the library soname * prepareInstalledDevelLib will fail if there is no soname. diff --git a/src/Makefile b/src/Makefile index 507632b..dd3c36b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -67,7 +67,7 @@ $(LUAC_T): $(LUAC_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) $(LUA_SO): $(CORE_O) $(LIB_O) - $(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS) + $(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$(V) $(LDFLAGS) $? $(LIBS) clean: $(RM) $(ALL_T) $(ALL_O) -- 1.8.3.4 From a367a186c5058f68c758f0ff6fc45f3033a5ae97 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 22 Oct 2013 02:42:32 -0600 Subject: =?UTF-8?q?Allow=20passing=20LUA=5FROOT=20and=20LUA=5FLDIR=20on=20?= =?UTF-8?q?the=20command=20line=0APass=20V=20(version)=20onto=20src/Makefi?= =?UTF-8?q?le?= diff --git a/Makefile b/Makefile index 22d3a62..729ede5 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ R= $V.1 all: $(PLAT) $(PLATS) clean: - cd src && $(MAKE) $@ + cd src && $(MAKE) V=$(V) $@ test: dummy src/lua -v diff --git a/src/luaconf.h b/src/luaconf.h index 107b864..2418ef6 100644 --- a/src/luaconf.h +++ b/src/luaconf.h @@ -107,8 +107,12 @@ #else /* }{ */ #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" +#ifndef LUA_ROOT #define LUA_ROOT "/usr/local/" +#endif +#ifndef LUA_LDIR #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR +#endif #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR #define LUA_PATH_DEFAULT \ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ -- 1.8.3.4