Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix build and make bootstrap

  • Loading branch information...
commit 2606a5808a3645c07a0d37c788348a993b391fa9 1 parent e9b4475
@richardhundt authored
View
12 Makefile
@@ -2,7 +2,6 @@ SRCDIR=./src
BLDDIR=./build
LPEGDIR=./deps/lpeg
LUADIR=./deps/luajit
-LUVDIR=./deps/luv
LIBDIR=./lib
BINDIR=${BLDDIR}/bin
@@ -10,7 +9,7 @@ OS_NAME=$(shell uname -s)
MH_NAME=$(shell uname -m)
CFLAGS=-O2 -Wall
-LDFLAGS=-lluv -lluajit -lstdc++ -lm -ldl -lpthread
+LDFLAGS=-lluajit -lstdc++ -lm -ldl -lpthread
ifeq (${OS_NAME}, Darwin)
ifeq (${MH_NAME}, x86_64)
@@ -21,8 +20,8 @@ CFLAGS+=-Wl,-E -fomit-frame-pointer -fno-stack-protector
LDFLAGS+=-lrt
endif
-INCS=-I${LUVDIR}/src -I${LUADIR}/src -L${LUADIR}/src -L${LUVDIR}/src -I${LUVDIR}/src/zmq/include -I${LUVDIR}/src/uv/include
-DEPS=${LUADIR}/src/libluajit.a ${LIBDIR}/lpeg.so ${LIBDIR}/luv.so
+INCS=-I${LUADIR}/src -L${LUADIR}/src
+DEPS=${LUADIR}/src/libluajit.a ${LIBDIR}/lpeg.so
all: ${BINDIR}/lupa
@@ -39,11 +38,6 @@ ${LIBDIR}/lpeg.so:
${MAKE} -C ${LPEGDIR}
cp ${LPEGDIR}/lpeg.so ${LIBDIR}/lpeg.so
-${LIBDIR}/luv.so:
- git submodule update --init ${LUVDIR}
- ${MAKE} -C ${LUVDIR}
- cp ${LUVDIR}/src/luv.so ${LIBDIR}/luv.so
-
clean:
rm -rf ${BLDDIR}
rm -f ./lib/*.so
View
BIN  lib/lupa/core.lua
Binary file not shown
View
909 src/core.h
452 additions, 457 deletions not shown
View
3  src/lib_init.c
@@ -13,8 +13,6 @@
#include "lj_arch.h"
-#include "luv.h"
-
int luaopen_lpeg (lua_State *L);
static const luaL_Reg lj_lib_load[] = {
@@ -36,7 +34,6 @@ static const luaL_Reg lj_lib_preload[] = {
#if LJ_HASFFI
{ LUA_FFILIBNAME, luaopen_ffi },
#endif
- { "luv", luaopen_luv },
{ NULL, NULL }
};
View
1  src/lupa/core.lua
@@ -16,7 +16,6 @@ package.path = ';;./lib/?.lua;'..package.path
package.cpath = ';;./lib/?.so;'..package.cpath
local lpeg = require("lpeg")
-local luv = require("luv")
function newtable(...) return { ... } end
local rawget, rawset = rawget, rawset
Please sign in to comment.
Something went wrong with that request. Please try again.