Skip to content
This repository
Browse code

fix build and make bootstrap

  • Loading branch information...
commit 2606a5808a3645c07a0d37c788348a993b391fa9 1 parent e9b4475
Richard Hundt authored
12 Makefile
@@ -2,7 +2,6 @@ SRCDIR=./src
2 2 BLDDIR=./build
3 3 LPEGDIR=./deps/lpeg
4 4 LUADIR=./deps/luajit
5   -LUVDIR=./deps/luv
6 5 LIBDIR=./lib
7 6 BINDIR=${BLDDIR}/bin
8 7
@@ -10,7 +9,7 @@ OS_NAME=$(shell uname -s)
10 9 MH_NAME=$(shell uname -m)
11 10
12 11 CFLAGS=-O2 -Wall
13   -LDFLAGS=-lluv -lluajit -lstdc++ -lm -ldl -lpthread
  12 +LDFLAGS=-lluajit -lstdc++ -lm -ldl -lpthread
14 13
15 14 ifeq (${OS_NAME}, Darwin)
16 15 ifeq (${MH_NAME}, x86_64)
@@ -21,8 +20,8 @@ CFLAGS+=-Wl,-E -fomit-frame-pointer -fno-stack-protector
21 20 LDFLAGS+=-lrt
22 21 endif
23 22
24   -INCS=-I${LUVDIR}/src -I${LUADIR}/src -L${LUADIR}/src -L${LUVDIR}/src -I${LUVDIR}/src/zmq/include -I${LUVDIR}/src/uv/include
25   -DEPS=${LUADIR}/src/libluajit.a ${LIBDIR}/lpeg.so ${LIBDIR}/luv.so
  23 +INCS=-I${LUADIR}/src -L${LUADIR}/src
  24 +DEPS=${LUADIR}/src/libluajit.a ${LIBDIR}/lpeg.so
26 25
27 26 all: ${BINDIR}/lupa
28 27
@@ -39,11 +38,6 @@ ${LIBDIR}/lpeg.so:
39 38 ${MAKE} -C ${LPEGDIR}
40 39 cp ${LPEGDIR}/lpeg.so ${LIBDIR}/lpeg.so
41 40
42   -${LIBDIR}/luv.so:
43   - git submodule update --init ${LUVDIR}
44   - ${MAKE} -C ${LUVDIR}
45   - cp ${LUVDIR}/src/luv.so ${LIBDIR}/luv.so
46   -
47 41 clean:
48 42 rm -rf ${BLDDIR}
49 43 rm -f ./lib/*.so
BIN  lib/lupa/core.lua
Binary file not shown
909 src/core.h
452 additions, 457 deletions not shown
3  src/lib_init.c
@@ -13,8 +13,6 @@
13 13
14 14 #include "lj_arch.h"
15 15
16   -#include "luv.h"
17   -
18 16 int luaopen_lpeg (lua_State *L);
19 17
20 18 static const luaL_Reg lj_lib_load[] = {
@@ -36,7 +34,6 @@ static const luaL_Reg lj_lib_preload[] = {
36 34 #if LJ_HASFFI
37 35 { LUA_FFILIBNAME, luaopen_ffi },
38 36 #endif
39   - { "luv", luaopen_luv },
40 37 { NULL, NULL }
41 38 };
42 39
1  src/lupa/core.lua
@@ -16,7 +16,6 @@ package.path = ';;./lib/?.lua;'..package.path
16 16 package.cpath = ';;./lib/?.so;'..package.cpath
17 17
18 18 local lpeg = require("lpeg")
19   -local luv = require("luv")
20 19
21 20 function newtable(...) return { ... } end
22 21 local rawget, rawset = rawget, rawset

0 comments on commit 2606a58

Please sign in to comment.
Something went wrong with that request. Please try again.