diff options
author | dholland <dholland@pkgsrc.org> | 2014-06-28 21:05:11 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2014-06-28 21:05:11 +0000 |
commit | 92eec63e9a11345aca1fbe68f7cfea58f431e855 (patch) | |
tree | b28fc83f65d0784ddd35fffe4e956e8331566381 | |
parent | a1561e67e3aa2b6d6de71210e5c873c098ca46b0 (diff) | |
download | pkgsrc-92eec63e9a11345aca1fbe68f7cfea58f431e855.tar.gz |
Work around build problem seen only in pbulk (remains unclear why).
Disable build dependence on gperf as the build doesn't actually run
it, and also for this workaround I need to patch the gperf output
file.
-rw-r--r-- | cad/verilog/Makefile | 9 | ||||
-rw-r--r-- | cad/verilog/distinfo | 3 | ||||
-rw-r--r-- | cad/verilog/patches/patch-lexor_keyword.cc | 28 |
3 files changed, 37 insertions, 3 deletions
diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile index 58e467e9367..f8910c691d9 100644 --- a/cad/verilog/Makefile +++ b/cad/verilog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2014/02/15 13:46:12 mef Exp $ +# $NetBSD: Makefile,v 1.39 2014/06/28 21:05:11 dholland Exp $ # DISTNAME= verilog-0.9.7 @@ -64,8 +64,13 @@ post-install: disciplines.vams \ ${DESTDIR}${PREFIX}/lib/ivl/include ) +# +# 1. this should be BUILD_DEPENDS +# 2. it doesn't actually run it during the build anyhow +# +#.include "../../devel/gperf/buildlink3.mk" + .include "../../devel/zlib/buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" -.include "../../devel/gperf/buildlink3.mk" .include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/verilog/distinfo b/cad/verilog/distinfo index 7330b4c7fd7..8b5ab207ac2 100644 --- a/cad/verilog/distinfo +++ b/cad/verilog/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2014/01/07 09:43:54 mef Exp $ +$NetBSD: distinfo,v 1.18 2014/06/28 21:05:11 dholland Exp $ SHA1 (verilog-0.9.7.tar.gz) = 714c2a605779957490cca24e3dc01d096dbc1474 RMD160 (verilog-0.9.7.tar.gz) = 3bac03ca703465a43c5a0a8175a3d27ee00f49a7 @@ -6,4 +6,5 @@ Size (verilog-0.9.7.tar.gz) = 1238088 bytes SHA1 (patch-aa) = cf075110416f6db0892129796cd83b8ae8de55fa SHA1 (patch-ad) = bf7d227ed3b321021d8aff54cd008f4b2a1557b9 SHA1 (patch-cadpli_Makefile) = ed21a5f529ac449c26b831cbd5fde052d9ed5466 +SHA1 (patch-lexor_keyword.cc) = 375aa534e91b0ee05615732b4bdcacdd9034ed3d SHA1 (patch-vpi_Makefile) = a2c1c120a02593cf2eb75dc3dd458727d230e82d diff --git a/cad/verilog/patches/patch-lexor_keyword.cc b/cad/verilog/patches/patch-lexor_keyword.cc new file mode 100644 index 00000000000..bf01f79b41e --- /dev/null +++ b/cad/verilog/patches/patch-lexor_keyword.cc @@ -0,0 +1,28 @@ +$NetBSD: patch-lexor_keyword.cc,v 1.1 2014/06/28 21:05:11 dholland Exp $ + +Remove inline declarations that sometimes cause build failures. (Seen +in pbulk but not outside, with the same gcc versions and everything; +not at all clear why.) static is an adequate substitute here and +should produce the same results with recent compilers anyhow. + +Note that this file is gperf output -- if the build decides to run +gperf it will clobber this patch and the results might or might not +compile depending on whatever unknown factors are involved in it +failing in the first place. + +--- lexor_keyword.cc~ 2013-08-19 19:12:46.000000000 +0000 ++++ lexor_keyword.cc +@@ -108,12 +108,7 @@ keyword_hash (register const char *str, + return hval + asso_values[(unsigned char)str[len - 1]]; + } + +-#ifdef __GNUC__ +-__inline +-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +-__attribute__ ((__gnu_inline__)) +-#endif +-#endif ++static + const struct lexor_keyword * + check_identifier (register const char *str, register unsigned int len) + { |