Wed Jul 8 17:11:52 2020 UTC ()
lua-cjson: Respect CFLAGS


(nia)
diff -r1.5 -r1.6 pkgsrc/textproc/lua-cjson/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/lua-cjson/PLIST
diff -r1.2 -r1.3 pkgsrc/textproc/lua-cjson/distinfo
diff -r0 -r1.1 pkgsrc/textproc/lua-cjson/patches/patch-Makefile
cvs diff -r1.5 -r1.6 pkgsrc/textproc/lua-cjson/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/lua-cjson/Makefile 2020/07/02 10:26:19 1.5
+++ pkgsrc/textproc/lua-cjson/Makefile 2020/07/08 17:11:52 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
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
3DISTNAME= lua-cjson-2.1.0 3DISTNAME= lua-cjson-2.1.0
4PKGNAME= ${LUA_PKGPREFIX}-cjson-2.1.0 4PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/^lua-//1}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= textproc lua 6CATEGORIES= textproc lua
7MASTER_SITES= http://www.kyne.com.au/~mark/software/download/ 7MASTER_SITES= http://www.kyne.com.au/~mark/software/download/
8 8
9MAINTAINER= imil@NetBSD.org 9MAINTAINER= imil@NetBSD.org
10HOMEPAGE= https://www.kyne.com.au/~mark/software/lua-cjson.php 10HOMEPAGE= https://www.kyne.com.au/~mark/software/lua-cjson.php
11COMMENT= Lua CJSON provides JSON support for Lua 11COMMENT= Lua CJSON provides JSON support for Lua
12LICENSE= mit 12LICENSE= mit
13 13
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
15 15
16MAKE_ENV+= LUA_CDIR=${LUA_CDIR} 16MAKE_ENV+= LUA_CDIR=${LUA_CDIR}
17 17
18INSTALLATION_DIRS= ${LUA_CDIR} 18INSTALLATION_DIRS= ${LUA_CDIR}
cvs diff -r1.1 -r1.2 pkgsrc/textproc/lua-cjson/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/lua-cjson/PLIST 2014/03/22 13:44:02 1.1
+++ pkgsrc/textproc/lua-cjson/PLIST 2020/07/08 17:11:52 1.2
@@ -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
cvs diff -r1.2 -r1.3 pkgsrc/textproc/lua-cjson/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/lua-cjson/distinfo 2015/11/04 01:59:39 1.2
+++ pkgsrc/textproc/lua-cjson/distinfo 2020/07/08 17:11:52 1.3
@@ -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
3SHA1 (lua-cjson-2.1.0.tar.gz) = 48f5546b28059c68545a7fb76146540df8be266c 3SHA1 (lua-cjson-2.1.0.tar.gz) = 48f5546b28059c68545a7fb76146540df8be266c
4RMD160 (lua-cjson-2.1.0.tar.gz) = badd55a5a2ec0ec544938ceeb62d1d9e0b6bd175 4RMD160 (lua-cjson-2.1.0.tar.gz) = badd55a5a2ec0ec544938ceeb62d1d9e0b6bd175
5SHA512 (lua-cjson-2.1.0.tar.gz) = 4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f 5SHA512 (lua-cjson-2.1.0.tar.gz) = 4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f
6Size (lua-cjson-2.1.0.tar.gz) = 86024 bytes 6Size (lua-cjson-2.1.0.tar.gz) = 86024 bytes
 7SHA1 (patch-Makefile) = 2c29aaaf8f731a73a58f9a5f0712819cb9a0cd3f
File Added: pkgsrc/textproc/lua-cjson/patches/patch-Makefile
$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