diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-09 12:41:35 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-09 12:43:02 +0000 |
| commit | cfba3b0ee40426e15efc0ddb363e813c42df1539 (patch) | |
| tree | 79742c8269064c8a50b190a2916456d17ebe9ae3 /main/lua-cjson/0001-Use-pkg-config-to-detect-cflags-or-fallback-to-LUA_I.patch | |
| parent | 39ddbc9b6a6d18c3d61864db93dd8e68fd3febc4 (diff) | |
| download | aports-cfba3b0ee40426e15efc0ddb363e813c42df1539.tar.bz2 aports-cfba3b0ee40426e15efc0ddb363e813c42df1539.tar.xz | |
main/lua-cjson: upgrade to 2.1.0 and build for both lua 5.1 and 5.2
Diffstat (limited to 'main/lua-cjson/0001-Use-pkg-config-to-detect-cflags-or-fallback-to-LUA_I.patch')
| -rw-r--r-- | main/lua-cjson/0001-Use-pkg-config-to-detect-cflags-or-fallback-to-LUA_I.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/main/lua-cjson/0001-Use-pkg-config-to-detect-cflags-or-fallback-to-LUA_I.patch b/main/lua-cjson/0001-Use-pkg-config-to-detect-cflags-or-fallback-to-LUA_I.patch new file mode 100644 index 000000000..a31344744 --- /dev/null +++ b/main/lua-cjson/0001-Use-pkg-config-to-detect-cflags-or-fallback-to-LUA_I.patch @@ -0,0 +1,40 @@ +From 659e292fc741163f6e4370ff682e3e42312cd51d Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 26 Jun 2013 06:33:15 +0000 +Subject: [PATCH] Use pkg-config to detect cflags or fallback to + LUA_INCLUDE_DIR + +--- + Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6fdb1f2..ed0f925 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,10 +18,13 @@ PREFIX = /usr/local + CFLAGS = -O3 -Wall -pedantic -DNDEBUG + CJSON_CFLAGS = -fpic + CJSON_LDFLAGS = -shared ++LUA_PC = lua$(LUA_VERSION) + LUA_INCLUDE_DIR = $(PREFIX)/include + LUA_CMODULE_DIR = $(PREFIX)/lib/lua/$(LUA_VERSION) + LUA_MODULE_DIR = $(PREFIX)/share/lua/$(LUA_VERSION) + LUA_BIN_DIR = $(PREFIX)/bin ++LUA_CFLAGS = $(shell pkg-config $(LUA_PC) --cflags --silence-errors \ ++ || echo "-I$(LUA_INCLUDE_DIR)") + + ##### Platform overrides ##### + ## +@@ -79,7 +82,7 @@ EXECPERM = 755 + + ASCIIDOC = asciidoc + +-BUILD_CFLAGS = -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS) ++BUILD_CFLAGS = $(LUA_CFLAGS) $(CJSON_CFLAGS) + OBJS = lua_cjson.o strbuf.o $(FPCONV_OBJS) + + .PHONY: all clean install install-extra doc +-- +1.8.3.1 + |