CVS commit: pkgsrc/devel/ucl

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Dec  1 11:13:38 UTC 2020

Modified Files:
        pkgsrc/devel/ucl: distinfo
Added Files:
        pkgsrc/devel/ucl/patches: patch-acc_acc__defs.h

Log Message:
ucl: Fix building with gcc >= 6.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ucl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ucl/patches/patch-acc_acc__defs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ucl/distinfo
diff -u pkgsrc/devel/ucl/distinfo:1.7 pkgsrc/devel/ucl/distinfo:1.8
--- pkgsrc/devel/ucl/distinfo:1.7       Wed Nov  4 17:41:18 2015
+++ pkgsrc/devel/ucl/distinfo   Tue Dec  1 11:13:37 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 17:41:18 agc Exp $
+$NetBSD: distinfo,v 1.8 2020/12/01 11:13:37 nia Exp $
 
 SHA1 (ucl-1.03.tar.gz) = 5847003d136fbbca1334dd5de10554c76c755f7c
 RMD160 (ucl-1.03.tar.gz) = d1b50127d482481c125eabff9a9c157d491c4a6a
 SHA512 (ucl-1.03.tar.gz) = 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34
 Size (ucl-1.03.tar.gz) = 534881 bytes
+SHA1 (patch-acc_acc__defs.h) = c2327d1346350e418856c5e162de2bf235f9dca7

Added files:

Index: pkgsrc/devel/ucl/patches/patch-acc_acc__defs.h
diff -u /dev/null pkgsrc/devel/ucl/patches/patch-acc_acc__defs.h:1.1
--- /dev/null   Tue Dec  1 11:13:38 2020
+++ pkgsrc/devel/ucl/patches/patch-acc_acc__defs.h      Tue Dec  1 11:13:38 2020
@@ -0,0 +1,30 @@
+$NetBSD: patch-acc_acc__defs.h,v 1.1 2020/12/01 11:13:38 nia Exp $
+
+Fix build with gcc >= 6.
+
+--- acc/acc_defs.h.orig        2004-07-19 23:01:47.000000000 +0000
++++ acc/acc_defs.h
+@@ -86,6 +86,11 @@
+ ************************************************************************/
+ 
+ /* This can be put into a header file but may get ignored by some compilers. */
++#if !defined(ACC_COMPILE_TIME_ASSERT_HEADER) && defined(__STDC_VERSION__)
++#  if __STDC_VERSION__ >= 201112L
++#    define ACC_COMPILE_TIME_ASSERT_HEADER(e) _Static_assert(e, #e);
++#  endif
++#endif
+ #if !defined(ACC_COMPILE_TIME_ASSERT_HEADER)
+ #  if (ACC_CC_AZTECC || ACC_CC_ZORTECHC)
+ #    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
+@@ -99,6 +104,11 @@
+ #endif
+ 
+ /* This must appear within a function body. */
++#if !defined(ACC_COMPILE_TIME_ASSERT) && defined(__STDC_VERSION__)
++#  if __STDC_VERSION__ >= 201112L
++#    define ACC_COMPILE_TIME_ASSERT(e) _Static_assert(e, #e);
++#  endif
++#endif
+ #if !defined(ACC_COMPILE_TIME_ASSERT)
+ #  if (ACC_CC_AZTECC)
+ #    define ACC_COMPILE_TIME_ASSERT(e)  {typedef int __acc_cta_t[1-!(e)];}