From: Fredrik Fornwall Date: Wed, 16 Nov 2016 23:24:09 +0000 (-0500) Subject: lua: Fix patch to not loose SYSCFLAGS X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/0afc826fc0dd5a75c1a08fa3cb6f5725384da438?hp=6257a921f7e3aa2175658d7928d69d1c49fa5bcb lua: Fix patch to not loose SYSCFLAGS Not having SYSCFLAGS caused LUA_USE_LINUX to be lost, and io.popen (and probably other things) was not enabled. Fixes #552. --- diff --git a/packages/lua/build.sh b/packages/lua/build.sh index f7b57638..3accee87 100644 --- a/packages/lua/build.sh +++ b/packages/lua/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.lua.org/ TERMUX_PKG_DESCRIPTION="Powerful, fast, lightweight, embeddable scripting language" TERMUX_PKG_VERSION=5.3.3 -TERMUX_PKG_BUILD_REVISION=2 +TERMUX_PKG_BUILD_REVISION=3 TERMUX_PKG_SRCURL=http://www.lua.org/ftp/lua-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="readline" TERMUX_PKG_EXTRA_MAKE_ARGS=linux diff --git a/packages/lua/src-Makefile.patch b/packages/lua/src-Makefile.patch index 2baa91f4..02b01d87 100644 --- a/packages/lua/src-Makefile.patch +++ b/packages/lua/src-Makefile.patch @@ -1,12 +1,13 @@ diff -u -r ../lua-5.3.0/src/Makefile ./src/Makefile --- ../lua-5.3.0/src/Makefile 2015-01-05 11:04:52.000000000 -0500 +++ ./src/Makefile 2015-05-24 18:06:15.958404755 -0400 -@@ -6,13 +6,7 @@ +@@ -6,13 +6,8 @@ # Your platform. See PLATS for possible values. PLAT= none -CC= gcc -std=gnu99 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS+= $(SYSCFLAGS) -LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) LIBS= -lm $(SYSLIBS) $(MYLIBS) -