Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lua/luvit/files: luvit-0.6.1-unbundle-http-parser.patch
Date: Sun, 30 Jun 2013 20:44:17
Message-Id: 20130630204414.1F0402171D@flycatcher.gentoo.org
1 hasufell 13/06/30 20:44:14
2
3 Added: luvit-0.6.1-unbundle-http-parser.patch
4 Log:
5 revbump (use system http-parser and luajit), remove old
6
7 (Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
8
9 Revision Changes Path
10 1.1 dev-lua/luvit/files/luvit-0.6.1-unbundle-http-parser.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/files/luvit-0.6.1-unbundle-http-parser.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/files/luvit-0.6.1-unbundle-http-parser.patch?rev=1.1&content-type=text/plain
14
15 Index: luvit-0.6.1-unbundle-http-parser.patch
16 ===================================================================
17 commit b34b7b0474878d1951637b762c68694c16c1c574
18 Author: hasufell <hasufell@g.o>
19 Date: Sun Jun 30 22:37:10 2013 +0200
20
21 unbundle http-parser
22
23 diff --git a/Makefile b/Makefile
24 index a0e9277..99535ca 100644
25 --- a/Makefile
26 +++ b/Makefile
27 @@ -38,6 +38,7 @@ USE_SYSTEM_SSL?=0
28 USE_SYSTEM_LUAJIT?=0
29 USE_SYSTEM_ZLIB?=0
30 USE_SYSTEM_YAJL?=0
31 +USE_SYSTEM_HTTPPARSER?=0
32
33 DEBUG ?= 1
34 ifeq (${DEBUG},1)
35 @@ -92,6 +93,10 @@ endif
36
37 LIBS += ${UVDIR}/uv.a
38
39 +ifeq (${USE_SYSTEM_HTTPPARSER},1)
40 +LIBS += -lhttp_parser
41 +endif
42 +
43 ifeq (${USE_SYSTEM_LUAJIT},1)
44 CPPFLAGS+=$(shell pkg-config --cflags luajit)
45 LIBS+=$(shell pkg-config --libs luajit)
46 @@ -169,8 +174,11 @@ LUVLIBS=${BUILDDIR}/utils.o \
47 ${BUILDDIR}/luv_zlib.o \
48 ${BUILDDIR}/lhttp_parser.o
49
50 -DEPS= ${UVDIR}/uv.a \
51 - ${HTTPDIR}/http_parser.o
52 +DEPS= ${UVDIR}/uv.a
53 +
54 +ifeq (${USE_SYSTEM_HTTPPARSER},0)
55 +DEPS += ${HTTPDIR}/http_parser.o
56 +endif
57
58 ifeq (${USE_SYSTEM_LUAJIT},0)
59 DEPS+=${LUADIR}/src/libluajit.a
60 @@ -278,8 +286,10 @@ install: all
61 install ${BUILDDIR}/luvit ${BINDIR}/luvit
62 mkdir -p ${LIBDIR}
63 cp lib/luvit/*.lua ${LIBDIR}
64 +ifeq (${USE_SYSTEM_HTTPPARSER},0)
65 mkdir -p ${INCDIR}/http_parser
66 cp ${HTTPDIR}/http_parser.h ${INCDIR}/http_parser/
67 +endif
68 mkdir -p ${INCDIR}/uv
69 cp -r ${UVDIR}/include/* ${INCDIR}/uv/
70 cp src/*.h ${INCDIR}/