lua-cjson: Respect CFLAGSdiff -r1.5 -r1.6 pkgsrc/textproc/lua-cjson/Makefile
(nia)
@@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
1 | # $NetBSD: Makefile,v 1.5 2020/07/02 10:26:19 nia Exp $ | 1 | # $NetBSD: Makefile,v 1.6 2020/07/08 17:11:52 nia Exp $ | |
2 | 2 | |||
3 | DISTNAME= lua-cjson-2.1.0 | 3 | DISTNAME= lua-cjson-2.1.0 | |
4 | PKGNAME= ${LUA_PKGPREFIX}-cjson-2.1.0 | 4 | PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/^lua-//1} | |
5 | PKGREVISION= 2 | 5 | PKGREVISION= 3 | |
6 | CATEGORIES= textproc lua | 6 | CATEGORIES= textproc lua | |
7 | MASTER_SITES= http://www.kyne.com.au/~mark/software/download/ | 7 | MASTER_SITES= http://www.kyne.com.au/~mark/software/download/ | |
8 | 8 | |||
9 | MAINTAINER= imil@NetBSD.org | 9 | MAINTAINER= imil@NetBSD.org | |
10 | HOMEPAGE= https://www.kyne.com.au/~mark/software/lua-cjson.php | 10 | HOMEPAGE= https://www.kyne.com.au/~mark/software/lua-cjson.php | |
11 | COMMENT= Lua CJSON provides JSON support for Lua | 11 | COMMENT= Lua CJSON provides JSON support for Lua | |
12 | LICENSE= mit | 12 | LICENSE= mit | |
13 | 13 | |||
14 | USE_TOOLS+= gmake | 14 | USE_TOOLS+= gmake | |
15 | 15 | |||
16 | MAKE_ENV+= LUA_CDIR=${LUA_CDIR} | 16 | MAKE_ENV+= LUA_CDIR=${LUA_CDIR} | |
17 | 17 | |||
18 | INSTALLATION_DIRS= ${LUA_CDIR} | 18 | INSTALLATION_DIRS= ${LUA_CDIR} | |
19 | 19 | |||
20 | do-install: | 20 | do-install: | |
21 | ${INSTALL_LIB} ${WRKSRC}/cjson.so \ | 21 | ${INSTALL_LIB} ${WRKSRC}/cjson.so \ | |
22 | ${DESTDIR}${PREFIX}/${LUA_CDIR} | 22 | ${DESTDIR}${PREFIX}/${LUA_CDIR} | |
23 | 23 | |||
24 | 24 | |||
25 | .include "../../lang/lua/module.mk" | 25 | .include "../../lang/lua/module.mk" | |
26 | .include "../../mk/bsd.pkg.mk" | 26 | .include "../../mk/bsd.pkg.mk" |
@@ -1,2 +1,2 @@ | @@ -1,2 +1,2 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1 2014/03/22 13:44:02 imil Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2020/07/08 17:11:52 nia Exp $ | |
2 | ${LUA_CDIR}/cjson.so | 2 | ${LUA_CDIR}/cjson.so |
@@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.2 2015/11/04 01:59:39 agc Exp $ | 1 | $NetBSD: distinfo,v 1.3 2020/07/08 17:11:52 nia Exp $ | |
2 | 2 | |||
3 | SHA1 (lua-cjson-2.1.0.tar.gz) = 48f5546b28059c68545a7fb76146540df8be266c | 3 | SHA1 (lua-cjson-2.1.0.tar.gz) = 48f5546b28059c68545a7fb76146540df8be266c | |
4 | RMD160 (lua-cjson-2.1.0.tar.gz) = badd55a5a2ec0ec544938ceeb62d1d9e0b6bd175 | 4 | RMD160 (lua-cjson-2.1.0.tar.gz) = badd55a5a2ec0ec544938ceeb62d1d9e0b6bd175 | |
5 | SHA512 (lua-cjson-2.1.0.tar.gz) = 4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f | 5 | SHA512 (lua-cjson-2.1.0.tar.gz) = 4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f | |
6 | Size (lua-cjson-2.1.0.tar.gz) = 86024 bytes | 6 | Size (lua-cjson-2.1.0.tar.gz) = 86024 bytes | |
7 | SHA1 (patch-Makefile) = 2c29aaaf8f731a73a58f9a5f0712819cb9a0cd3f |
$NetBSD: patch-Makefile,v 1.1 2020/07/08 17:11:52 nia Exp $
Respect CFLAGS.
--- Makefile.orig 2012-03-01 12:22:50.000000000 +0000
+++ Makefile
@@ -15,7 +15,7 @@ LUA_VERSION = 5.1
TARGET = cjson.so
PREFIX = /usr/local
#CFLAGS = -g -Wall -pedantic -fno-inline
-CFLAGS = -O3 -Wall -pedantic -DNDEBUG
+CFLAGS += -Wall -pedantic -DNDEBUG
CJSON_CFLAGS = -fpic
CJSON_LDFLAGS = -shared
LUA_INCLUDE_DIR = $(PREFIX)/include