Thu Jul 17 22:32:01 2014 UTC ()
Pullup ticket #4458 - requested by obache
textproc/json-c: bug fix patch

Revisions pulled up:
- textproc/json-c/Makefile                                      1.10
- textproc/json-c/hacks.mk                                      1.1

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Thu Jul 17 09:18:27 UTC 2014

   Modified Files:
   	pkgsrc/textproc/json-c: Makefile
   Added Files:
   	pkgsrc/textproc/json-c: hacks.mk

   Log Message:
   Add hack for using gcc builtin atomic function, missing for i386.
   PR pkg/48990.

   Bump PKGREVISION.


(tron)
diff -r1.9 -r1.9.2.1 pkgsrc/textproc/json-c/Makefile
diff -r0 -r1.1.2.2 pkgsrc/textproc/json-c/hacks.mk
cvs diff -r1.9 -r1.9.2.1 pkgsrc/textproc/json-c/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/json-c/Makefile 2014/05/10 04:09:41 1.9
+++ pkgsrc/textproc/json-c/Makefile 2014/07/17 22:32:01 1.9.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2014/05/10 04:09:41 pho Exp $ 1# $NetBSD: Makefile,v 1.9.2.1 2014/07/17 22:32:01 tron Exp $
2 2
3DISTNAME= json-c-0.12 3DISTNAME= json-c-0.12
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= https://s3.amazonaws.com/json-c_releases/releases/ 6MASTER_SITES= https://s3.amazonaws.com/json-c_releases/releases/
7 7
8MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= https://github.com/json-c/json-c/wiki 9HOMEPAGE= https://github.com/json-c/json-c/wiki
10COMMENT= JSON library in C 10COMMENT= JSON library in C
11LICENSE= mit 11LICENSE= mit
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
File Added: pkgsrc/textproc/json-c/hacks.mk
# $NetBSD: hacks.mk,v 1.1.2.2 2014/07/17 22:32:01 tron Exp $

.if !defined(JSON_C_HACKS_MK)
JSON_C_HACKS_MK=	# defined

# json-c>=0.12 depends on builtin functions which enabled with i486 and
# later with GCC.
#
.include "../../mk/compiler.mk"
.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-i386) && !empty(CC_VERSION:Mgcc-*)
GNU_ARCH.i386=		i486
CFLAGS+=		-march=i486
.endif

.endif