kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PR 46354 Lloyd Parkes: remove unnecessary gccism for non-gcc compilers.

Browse source
This commit is contained in:
dholland 2015-06-18 01:58:30 +00:00
parent 1a40408d59
commit daf7db22f1
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysutils/cfengine2/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.13 2010/05/09 22:09:30 pettai Exp $
$NetBSD: distinfo,v 1.14 2015/06/18 01:58:30 dholland Exp $
SHA1 (cfengine-2.2.10.tar.gz) = 032bec0bc59ffee7179422e96dfd902afbf94340
RMD160 (cfengine-2.2.10.tar.gz) = 67fd3dc80270dc000887e3dbf26f372338e2600f
@ -6,3 +6,4 @@ Size (cfengine-2.2.10.tar.gz) = 2690333 bytes
SHA1 (patch-aa) = cdbebcf1a8d284bbaa9e8e0deb60112c5e33287c
SHA1 (patch-ab) = bd2946d1cd5b21e3cf664258360c38c9651542a9
SHA1 (patch-ac) = ca643a6dd76307053923c93b321533b684d22474
SHA1 (patch-src_do.c) = 5773b0b2331818b2340ab288711840073507c25b

15
sysutils/cfengine2/patches/patch-src_do.c Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-src_do.c,v 1.1 2015/06/18 01:58:30 dholland Exp $
avoid gccism (from PR 46354)
--- src/do.c~ 2009-03-08 16:27:56.000000000 +0000
+++ src/do.c
@@ -2846,7 +2846,7 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->n
ExpandVarstring(ptr->name,name,"");
- snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ?: "", ptr->elsedef ?: "");
+ snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ? ptr->defines : "", ptr->elsedef ? ptr->elsedef : "");
if (!GetLock(ASUniqueName("packages"),CanonifyName(lock),ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
{