diff options
author | YAEGASHI Takeshi <yaegashi@debian.org> | 2014-02-18 07:28:45 (JST) |
---|---|---|
committer | YAEGASHI Takeshi <yaegashi@debian.org> | 2014-02-18 07:28:45 (JST) |
commit | 73fccbdc4d28ebabf1f4ce99b9e1f3455a509b0c (patch) | |
tree | 6d49b48b0dbbf619e1a4d4922fe7facc21a00c65 | |
parent | b24af70a0064ec02896000fe36e892b05833a661 (diff) | |
download | cgit-73fccbdc4d28ebabf1f4ce99b9e1f3455a509b0c.zip cgit-73fccbdc4d28ebabf1f4ce99b9e1f3455a509b0c.tar.gz |
Add 0003-pkg-config-lua52.patch
-rw-r--r-- | debian/patches/0003-pkg-config-lua52.patch | 24 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/0003-pkg-config-lua52.patch b/debian/patches/0003-pkg-config-lua52.patch new file mode 100644 index 0000000..74151eb --- /dev/null +++ b/debian/patches/0003-pkg-config-lua52.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From: YAEGASHI Takeshi <yaegashi@debian.org> | ||
2 | Date: Tue, 18 Feb 2014 07:24:45 +0900 | ||
3 | Subject: pkg-config lua52 | ||
4 | |||
5 | pkg-config must use lua52.pc provided by liblua5.2-dev. | ||
6 | --- | ||
7 | cgit.mk | 4 ++-- | ||
8 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git a/cgit.mk b/cgit.mk | ||
11 | index 056c3f9..41b514e 100644 | ||
12 | --- a/cgit.mk | ||
13 | +++ b/cgit.mk | ||
14 | @@ -31,8 +31,8 @@ ifdef NO_LUA | ||
15 | else | ||
16 | LUAJIT_CFLAGS := $(shell pkg-config --cflags luajit 2>/dev/null) | ||
17 | LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null) | ||
18 | -LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null) | ||
19 | -LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null) | ||
20 | +LUA_LIBS := $(shell pkg-config --libs lua52 2>/dev/null) | ||
21 | +LUA_CFLAGS := $(shell pkg-config --cflags lua52 2>/dev/null) | ||
22 | ifeq (JIT,$(LUA_IMPLEMENTATION)) | ||
23 | ifeq ($(strip $(LUAJIT_LIBS)),) | ||
24 | $(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.) | ||
diff --git a/debian/patches/series b/debian/patches/series index dd1ea6a..3d58fec 100644 --- a/debian/patches/series +++ b/debian/patches/series | |||
@@ -1,2 +1,3 @@ | |||
1 | 0001-make-a2x-skip-xmllint.patch | 1 | 0001-make-a2x-skip-xmllint.patch |
2 | 0002-introduce-debian-standard-build-flags.patch | 2 | 0002-introduce-debian-standard-build-flags.patch |
3 | 0003-pkg-config-lua52.patch | ||