From 56c3db0ed898edfcdd97397760385f25f3123859 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 12 Sep 2018 20:04:51 +0300 Subject: [PATCH] liblua51: remove package since it is not needed anymore --- x11-packages/liblua51/build.sh | 34 ------------ .../liblua51/lua-5.1.5_Makefile.patch | 12 ----- .../liblua51/lua-5.1.5_etc_lua.pc.patch | 31 ----------- .../liblua51/lua-5.1.5_src_Makefile.patch | 52 ------------------- .../liblua51/lua-5.1.5_src_luaconf.h.patch | 24 --------- x11-packages/liblua51/lua51.subpackage.sh | 3 -- 6 files changed, 156 deletions(-) delete mode 100644 x11-packages/liblua51/build.sh delete mode 100644 x11-packages/liblua51/lua-5.1.5_Makefile.patch delete mode 100644 x11-packages/liblua51/lua-5.1.5_etc_lua.pc.patch delete mode 100644 x11-packages/liblua51/lua-5.1.5_src_Makefile.patch delete mode 100644 x11-packages/liblua51/lua-5.1.5_src_luaconf.h.patch delete mode 100644 x11-packages/liblua51/lua51.subpackage.sh diff --git a/x11-packages/liblua51/build.sh b/x11-packages/liblua51/build.sh deleted file mode 100644 index 0716b4d35..000000000 --- a/x11-packages/liblua51/build.sh +++ /dev/null @@ -1,34 +0,0 @@ -TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" - -TERMUX_PKG_HOMEPAGE=https://www.lua.org -TERMUX_PKG_DESCRIPTION="Shared library for the Lua interpreter (v5.1.x)" -TERMUX_PKG_VERSION=5.1.5 -TERMUX_PKG_REVISION=8 -TERMUX_PKG_SRCURL=http://www.lua.org/ftp/lua-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 -TERMUX_PKG_BUILD_DEPENDS="readline" -TERMUX_PKG_BUILD_IN_SRC=yes - -termux_step_make() { - make -j ${TERMUX_MAKE_PROCESSES} \ - MYCFLAGS="${CFLAGS} -fPIC" \ - MYLDFLAGS="${LDFLAGS}" \ - CC="${CC}" \ - CXX="${CXX}" \ - linux -} - -termux_step_make_install() { - make \ - TO_BIN='lua5.1 luac5.1' \ - TO_LIB="liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.${TERMUX_PKG_VERSION}" \ - INSTALL_DATA='cp -d' \ - INSTALL_TOP="${TERMUX_PREFIX}" \ - INSTALL_INC="${TERMUX_PREFIX}/include/lua5.1" \ - INSTALL_MAN="${TERMUX_PREFIX}/share/man/man1" \ - install - install -Dm644 etc/lua.pc "${TERMUX_PREFIX}/lib/pkgconfig/lua51.pc" - - mv -f "${TERMUX_PREFIX}/share/man/man1/lua.1" "${TERMUX_PREFIX}/share/man/man1/lua5.1.1" - mv -f "${TERMUX_PREFIX}/share/man/man1/luac.1" "${TERMUX_PREFIX}/share/man/man1/luac5.1.1" -} diff --git a/x11-packages/liblua51/lua-5.1.5_Makefile.patch b/x11-packages/liblua51/lua-5.1.5_Makefile.patch deleted file mode 100644 index 85a07fd63..000000000 --- a/x11-packages/liblua51/lua-5.1.5_Makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr lua-5.1.5/Makefile lua-5.1.5.mod/Makefile ---- lua-5.1.5/Makefile 2012-02-10 11:50:23.000000000 +0200 -+++ lua-5.1.5.mod/Makefile 2018-06-26 16:07:10.957816161 +0300 -@@ -53,7 +53,7 @@ - all: $(PLAT) - - $(PLATS) clean: -- cd src && $(MAKE) $@ -+ cd src && $(MAKE) $@ V=$(V) R=$(R) - - test: dummy - src/lua test/hello.lua diff --git a/x11-packages/liblua51/lua-5.1.5_etc_lua.pc.patch b/x11-packages/liblua51/lua-5.1.5_etc_lua.pc.patch deleted file mode 100644 index 1113e4b14..000000000 --- a/x11-packages/liblua51/lua-5.1.5_etc_lua.pc.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -uNr lua-5.1.5/etc/lua.pc lua-5.1.5.mod/etc/lua.pc ---- lua-5.1.5/etc/lua.pc 2012-02-10 11:50:30.000000000 +0200 -+++ lua-5.1.5.mod/etc/lua.pc 2018-06-26 16:08:00.271151971 +0300 -@@ -8,9 +8,9 @@ - R= 5.1.5 - - # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' --prefix= /usr/local -+prefix= @TERMUX_PREFIX@ - INSTALL_BIN= ${prefix}/bin --INSTALL_INC= ${prefix}/include -+INSTALL_INC= ${prefix}/include/lua5.1 - INSTALL_LIB= ${prefix}/lib - INSTALL_MAN= ${prefix}/man/man1 - INSTALL_LMOD= ${prefix}/share/lua/${V} -@@ -19,13 +19,13 @@ - # canonical vars - exec_prefix=${prefix} - libdir=${exec_prefix}/lib --includedir=${prefix}/include -+includedir=${prefix}/include/lua5.1 - - Name: Lua - Description: An Extensible Extension Language - Version: ${R} - Requires: --Libs: -L${libdir} -llua -lm -+Libs: -L${libdir} -llua5.1 -lm - Cflags: -I${includedir} - - # (end of lua.pc) diff --git a/x11-packages/liblua51/lua-5.1.5_src_Makefile.patch b/x11-packages/liblua51/lua-5.1.5_src_Makefile.patch deleted file mode 100644 index 6dde63951..000000000 --- a/x11-packages/liblua51/lua-5.1.5_src_Makefile.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -uNr lua-5.1.5/src/Makefile lua-5.1.5.mod/src/Makefile ---- lua-5.1.5/src/Makefile 2012-02-13 22:41:22.000000000 +0200 -+++ lua-5.1.5.mod/src/Makefile 2018-06-26 16:09:37.357823513 +0300 -@@ -8,7 +8,8 @@ - PLAT= none - - CC= gcc --CFLAGS= -O2 -Wall $(MYCFLAGS) -+CFLAGS ?= -O2 -Wall -+CFLAGS += $(MYCFLAGS) - AR= ar rcu - RANLIB= ranlib - RM= rm -f -@@ -22,21 +23,22 @@ - - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - --LUA_A= liblua.a -+LUA_A= liblua5.1.a -+LUA_SO= liblua5.1.so - CORE_O= lapi.o lcode.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 - LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ - lstrlib.o loadlib.o linit.o - --LUA_T= lua -+LUA_T= lua5.1 - LUA_O= lua.o - --LUAC_T= luac -+LUAC_T= luac5.1 - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) - ALL_A= $(LUA_A) - - default: $(PLAT) -@@ -51,6 +53,11 @@ - $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO) -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - diff --git a/x11-packages/liblua51/lua-5.1.5_src_luaconf.h.patch b/x11-packages/liblua51/lua-5.1.5_src_luaconf.h.patch deleted file mode 100644 index 85a2b9007..000000000 --- a/x11-packages/liblua51/lua-5.1.5_src_luaconf.h.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uNr lua-5.1.5/src/luaconf.h lua-5.1.5.mod/src/luaconf.h ---- lua-5.1.5/src/luaconf.h 2008-02-11 18:25:08.000000000 +0200 -+++ lua-5.1.5.mod/src/luaconf.h 2018-06-26 16:07:10.961149496 +0300 -@@ -94,7 +94,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "@TERMUX_PREFIX@" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ -@@ -645,9 +645,9 @@ - - #if defined(LUA_USE_MKSTEMP) - #include --#define LUA_TMPNAMBUFSIZE 32 -+#define LUA_TMPNAMBUFSIZE 256 - #define lua_tmpnam(b,e) { \ -- strcpy(b, "/tmp/lua_XXXXXX"); \ -+ strcpy(b, "@TERMUX_PREFIX@/tmp/lua_XXXXXX"); \ - e = mkstemp(b); \ - if (e != -1) close(e); \ - e = (e == -1); } diff --git a/x11-packages/liblua51/lua51.subpackage.sh b/x11-packages/liblua51/lua51.subpackage.sh deleted file mode 100644 index ebf378c64..000000000 --- a/x11-packages/liblua51/lua51.subpackage.sh +++ /dev/null @@ -1,3 +0,0 @@ -TERMUX_SUBPKG_INCLUDE="bin/ share/man/man1/" -TERMUX_SUBPKG_DESCRIPTION="Simple, extensible, embeddable programming language" -TERMUX_SUBPKG_DEPENDS="readline"