From 6d2389e146f9097c569d8ab4b4c137ce5e52dad7 Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 17 Jul 2014 22:32:01 +0000 Subject: 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. --- textproc/json-c/Makefile | 4 ++-- textproc/json-c/hacks.mk | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 textproc/json-c/hacks.mk diff --git a/textproc/json-c/Makefile b/textproc/json-c/Makefile index 34061c3e116..fd633152574 100644 --- a/textproc/json-c/Makefile +++ b/textproc/json-c/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2014/05/10 04:09:41 pho Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2014/07/17 22:32:01 tron Exp $ DISTNAME= json-c-0.12 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= https://s3.amazonaws.com/json-c_releases/releases/ diff --git a/textproc/json-c/hacks.mk b/textproc/json-c/hacks.mk new file mode 100644 index 00000000000..3bdeffdbaf1 --- /dev/null +++ b/textproc/json-c/hacks.mk @@ -0,0 +1,15 @@ +# $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 -- cgit v1.2.3