luajit: Fix clang build

diff --git a/packages/libluajit/build.sh b/packages/libluajit/build.sh
index 18ab424..a34e5bb 100644 (file)
--- a/packages/libluajit/build.sh
+++ b/packages/libluajit/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Just-In-Time Compiler for Lua"
 TERMUX_PKG_VERSION=2.1.0~beta2
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://luajit.org/download/LuaJIT-2.1.0-beta2.tar.gz
-TERMUX_PKG_EXTRA_MAKE_ARGS="amalg PREFIX=$TERMUX_PREFIX"
+TERMUX_PKG_EXTRA_MAKE_ARGS="V=1 amalg PREFIX=$TERMUX_PREFIX"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="lua,lua-dev"
 TERMUX_PKG_REPLACES="lua,lua-dev"
@@ -21,12 +21,8 @@ termux_step_pre_configure() {
                        export HOST_LDFLAGS="-arch i386"
                fi
        fi
-       export CROSS=${TERMUX_HOST_PLATFORM}-
        export TARGET_FLAGS="$CFLAGS $CPPFLAGS $LDFLAGS"
        export TARGET_SYS=Linux
-
-       ORIG_STRIP=$STRIP
-       unset AR AS CC CXX CPP CPPFLAGS CFLAGS CXXFLAGS LDFLAGS RANLIB LD PKG_CONFIG STRIP
 }
 
 termux_step_make_install () {
@@ -53,6 +49,4 @@ termux_step_make_install () {
        rm -Rf $TERMUX_LUAJIT_JIT_FOLDER
        mkdir -p $TERMUX_LUAJIT_JIT_FOLDER
        cp $TERMUX_PKG_SRCDIR/src/jit/*lua $TERMUX_LUAJIT_JIT_FOLDER
-
-       STRIP=$ORIG_STRIP
 }

diff --git a/packages/libluajit/src-Makefile.patch b/packages/libluajit/src-Makefile.patch
index bf54383..b001f78 100644 (file)
--- a/packages/libluajit/src-Makefile.patch
+++ b/packages/libluajit/src-Makefile.patch
@@ -1,6 +1,15 @@
 diff -u -r ../LuaJIT-2.1.0-beta2/src/Makefile ./src/Makefile
---- ../LuaJIT-2.1.0-beta2/src/Makefile 2016-03-03 06:40:00.000000000 -0500
-+++ ./src/Makefile     2016-11-25 17:40:27.794487169 -0500
+--- ../LuaJIT-2.1.0-beta2/src/Makefile 2016-03-03 12:40:00.000000000 +0100
++++ ./src/Makefile     2017-01-15 17:10:13.854284079 +0100
+@@ -27,7 +27,7 @@
+ DEFAULT_CC = gcc
+ #
+ # LuaJIT builds as a native 32 or 64 bit binary by default.
+-CC= $(DEFAULT_CC)
++CC?= $(DEFAULT_CC)
+ #
+ # Use this if you want to force a 32 bit build on a 64 bit multilib OS.
+ #CC= $(DEFAULT_CC) -m32
 @@ -71,14 +71,14 @@
  # as dynamic mode.
  #
@@ -18,19 +27,32 @@ diff -u -r ../LuaJIT-2.1.0-beta2/src/Makefile ./src/Makefile
  #
  ##############################################################################
  
-@@ -166,10 +166,6 @@
-     HOST_SYS= Windows
-     HOST_MSYS= cygwin
-   endif
--  # Use Clang for OSX host.
--  ifeq (Darwin,$(HOST_SYS))
--    DEFAULT_CC= clang
--  endif
- endif
+@@ -191,7 +191,7 @@
+ CCOPTIONS= $(CCDEBUG) $(ASOPTIONS)
+ LDOPTIONS= $(CCDEBUG) $(LDFLAGS)
  
- ##############################################################################
-@@ -214,7 +210,7 @@
- TARGET_STRIP= $(CROSS)strip
+-HOST_CC= $(CC)
++HOST_CC?= $(CC)
+ HOST_RM= rm -f
+ # If left blank, minilua is built and used. You can supply an installed
+ # copy of (plain) Lua 5.1 or 5.2, plus Lua BitOp. E.g. with: HOST_LUA=lua
+@@ -204,17 +204,17 @@
+ HOST_ALDFLAGS= $(LDOPTIONS) $(HOST_XLDFLAGS) $(HOST_LDFLAGS)
+ HOST_ALIBS= $(HOST_XLIBS) $(LIBS) $(HOST_LIBS)
+ 
+-STATIC_CC = $(CROSS)$(CC)
+-DYNAMIC_CC = $(CROSS)$(CC) -fPIC
++STATIC_CC = $(CC)
++DYNAMIC_CC = $(CC) -fPIC
+ TARGET_CC= $(STATIC_CC)
+ TARGET_STCC= $(STATIC_CC)
+ TARGET_DYNCC= $(DYNAMIC_CC)
+-TARGET_LD= $(CROSS)$(CC)
+-TARGET_AR= $(CROSS)ar rcus
+-TARGET_STRIP= $(CROSS)strip
++TARGET_LD= $(CC)
++TARGET_AR= $(AR) rcus
++TARGET_STRIP= $(STRIP)
  
  TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib)
 -TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)