Skip to content

Commit

Permalink
add dvv's patch
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Phillips committed Mar 9, 2012
1 parent 337f7e0 commit 3af3b6e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
16 changes: 14 additions & 2 deletions Makefile
Expand Up @@ -7,6 +7,7 @@ UVDIR=deps/uv
UV_VERSION=$(shell git --git-dir ${UVDIR}/.git describe --all --long | cut -f 3 -d -)
HTTPDIR=deps/http-parser
HTTP_VERSION=$(shell git --git-dir ${HTTPDIR}/.git describe --tags)
SSLDIR=deps/openssl/openssl
BUILDDIR=build

PREFIX?=/usr/local
Expand Down Expand Up @@ -39,6 +40,7 @@ LDFLAGS+=-L${BUILDDIR} -lluvit
LDFLAGS+=${LUADIR}/src/libluajit.a
LDFLAGS+=${UVDIR}/uv.a
LDFLAGS+=${YAJLDIR}/yajl.a
LDFLAGS+=${SSLDIR}/libssl.a ${SSLDIR}/libcrypto.a
LDFLAGS+=-Wall -lm -ldl -lpthread

ifeq (${OS_NAME},Linux)
Expand All @@ -56,6 +58,8 @@ LUVLIBS=${BUILDDIR}/utils.o \
${BUILDDIR}/luv_process.o \
${BUILDDIR}/luv_stream.o \
${BUILDDIR}/luv_tcp.o \
${BUILDDIR}/luv_tls.o \
${BUILDDIR}/luv_tls_conn.o \
${BUILDDIR}/luv_pipe.o \
${BUILDDIR}/luv_tty.o \
${BUILDDIR}/luv_misc.o \
Expand All @@ -70,7 +74,8 @@ LUVLIBS=${BUILDDIR}/utils.o \
DEPS=${LUADIR}/src/libluajit.a \
${YAJLDIR}/yajl.a \
${UVDIR}/uv.a \
${HTTPDIR}/http_parser.o
${HTTPDIR}/http_parser.o \
${SSLDIR}/libssl.a

all: ${BUILDDIR}/luvit

Expand Down Expand Up @@ -104,9 +109,16 @@ ${HTTPDIR}/Makefile:
${HTTPDIR}/http_parser.o: ${HTTPDIR}/Makefile
${MAKE} -C ${HTTPDIR} http_parser.o

${SSLDIR}/Makefile:
git submodule update --init ${SSLDIR}/../

${SSLDIR}/libssl.a: ${SSLDIR}/Makefile
( cd ${SSLDIR}; ./config )
${MAKE} -C ${SSLDIR}

${BUILDDIR}/%.o: src/%.c ${DEPS}
mkdir -p ${BUILDDIR}
$(CC) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -c $< -o $@ -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
$(CC) --std=c89 -DUSE_OPENSSL -D_GNU_SOURCE -g -Wall -Werror -c $< -o $@ -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"

${BUILDDIR}/libluvit.a: ${LUVLIBS} ${DEPS}
$(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS} ${DEPS}
Expand Down
2 changes: 1 addition & 1 deletion src/luv_tls_conn.c
Expand Up @@ -484,7 +484,7 @@ tls_conn_is_init_finished(lua_State *L) {

static int
tls_conn_get_current_cipher(lua_State *L) {
SSL_CIPHER *c;
const SSL_CIPHER *c;
tls_conn_t *tc = getCONN(L, 1);
if (!tc->ssl) {
lua_pushnil(L);
Expand Down

0 comments on commit 3af3b6e

Please sign in to comment.