src/patches/lua-5.4.6-shared_library-1.patch

   1 Submitted By:            Douglas R. Reno <renodr at linuxfromscratch dot org>
   2 Date:                    2020-06-30
   3 Initial Package Version: 5.4.0
   4 Upstream Status:         Rejected
   5 Origin:                  Arch Linux, with some modifications
   6 Description:             Creates a shared liblua library, as well as
   7                          removes optimization since it causes SIGBUS errors,
   8                          and sets the search path to /usr from /usr/local.
   9                          The initial version of this patch was created by
  10                          Igor Zivkovic, before being rediffed for 5.4.0 by
  11                          myself with some modifications made.
  12
  13 diff -Naurp lua-5.4.0.orig/Makefile lua-5.4.0/Makefile
  14 --- lua-5.4.0.orig/Makefile     2020-04-15 07:55:07.000000000 -0500
  15 +++ lua-5.4.0/Makefile  2020-06-30 13:22:00.997938585 -0500
  16 @@ -52,7 +52,7 @@ R= $V.0
  17  all:   $(PLAT)
  18
  19  $(PLATS) help test clean:
  20 -       @cd src && $(MAKE) $@
  21 +       @cd src && $(MAKE) $@ V=$(V) R=$(R)
  22
  23  install: dummy
  24         cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
  25 diff -Naurp lua-5.4.0.orig/src/luaconf.h lua-5.4.0/src/luaconf.h
  26 --- lua-5.4.0.orig/src/luaconf.h        2020-06-18 09:25:54.000000000 -0500
  27 +++ lua-5.4.0/src/luaconf.h     2020-06-30 13:24:59.294932289 -0500
  28 @@ -227,7 +227,7 @@
  29
  30  #else                  /* }{ */
  31
  32 -#define LUA_ROOT       "/usr/local/"
  33 +#define LUA_ROOT       "/usr/"
  34  #define LUA_LDIR       LUA_ROOT "share/lua/" LUA_VDIR "/"
  35  #define LUA_CDIR       LUA_ROOT "lib/lua/" LUA_VDIR "/"
  36
  37 diff -Naurp lua-5.4.0.orig/src/Makefile lua-5.4.0/src/Makefile
  38 --- lua-5.4.0.orig/src/Makefile 2020-04-15 08:00:29.000000000 -0500
  39 +++ lua-5.4.0/src/Makefile      2020-06-30 13:24:15.746933827 -0500
  40 @@ -7,7 +7,7 @@
  41  PLAT= guess
  42
  43  CC= gcc -std=gnu99
  44 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
  45 +CFLAGS= -fPIC -O0 -Wall -Wextra -DLUA_COMPAT_5_3 -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1 $(SYSCFLAGS) $(MYCFLAGS)
  46  LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
  47  LIBS= -lm $(SYSLIBS) $(MYLIBS)
  48
  49 @@ -33,6 +33,7 @@ CMCFLAGS= -Os
  50  PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
  51
  52  LUA_A= liblua.a
  53 +LUA_SO=  liblua.so
  54  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
  55  LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
  56  BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
  57 @@ -44,7 +45,7 @@ LUAC_T=       luac
  58  LUAC_O=        luac.o
  59
  60  ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
  61 -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
  62 +ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
  63  ALL_A= $(LUA_A)
  64
  65  # Targets start here.
  66 @@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O)
  67         $(AR) $@ $(BASE_O)
  68         $(RANLIB) $@
  69
  70 +$(LUA_SO): $(CORE_O) $(LIB_O)
  71 +       $(CC) -shared -ldl -Wl,--soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm
  72 +       $(MYLDFLAGS)
  73 +       ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
  74 +       ln -sf $(LUA_SO).$(R) $(LUA_SO)
  75 +
  76  $(LUA_T): $(LUA_O) $(LUA_A)
  77         $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
  78