diff options
| author | nia <nia@pkgsrc.org> | 2019-07-17 10:53:22 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2019-07-17 10:53:22 +0000 |
| commit | d405d26756aba7768c87b038918f9e6800238317 (patch) | |
| tree | ed6c27a75974cf16978669006a6533563810f737 /chat/hexchat | |
| parent | 046dda3cc9cb567f8172a0438e856027e97e6ce4 (diff) | |
| download | pkgsrc-d405d26756aba7768c87b038918f9e6800238317.tar.gz | |
hexchat: Avoid races by explicitly depending on generated headers.
Diffstat (limited to 'chat/hexchat')
| -rw-r--r-- | chat/hexchat/Makefile | 5 | ||||
| -rw-r--r-- | chat/hexchat/distinfo | 3 | ||||
| -rw-r--r-- | chat/hexchat/patches/patch-src_common_meson.build | 15 |
3 files changed, 18 insertions, 5 deletions
diff --git a/chat/hexchat/Makefile b/chat/hexchat/Makefile index 15e37933a41..10b5f64d3de 100644 --- a/chat/hexchat/Makefile +++ b/chat/hexchat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/07/17 09:22:11 nia Exp $ +# $NetBSD: Makefile,v 1.35 2019/07/17 10:53:22 nia Exp $ DISTNAME= hexchat-2.14.2 CATEGORIES= chat @@ -41,9 +41,6 @@ PLIST_SUBST+= SOEXT=${SOEXT} LDFLAGS.SunOS+= -lsocket -lnsl -# It seems generated files are sometimes not generated in time. -MAKE_JOBS_SAFE= no - .include "../../devel/py-meson/build.mk" .include "../../textproc/iso-codes/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" diff --git a/chat/hexchat/distinfo b/chat/hexchat/distinfo index 568118cae07..2f9b76af039 100644 --- a/chat/hexchat/distinfo +++ b/chat/hexchat/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2019/05/08 17:19:41 nia Exp $ +$NetBSD: distinfo,v 1.9 2019/07/17 10:53:22 nia Exp $ SHA1 (hexchat-2.14.2.tar.xz) = 650f6247cc68c022ba4fee09ebde578dc2ec1c33 RMD160 (hexchat-2.14.2.tar.xz) = a41067f7dd9b0eceaf2252aa7a8b8eca7dd228fd @@ -9,3 +9,4 @@ SHA1 (patch-plugins_sysinfo_meson.build) = 4f5309ddded3c23014711e1b3305ff6a1c5f6 SHA1 (patch-plugins_sysinfo_unix_parse.c) = 92b882b7573cfcfc280351353a7bdcb0a7940c06 SHA1 (patch-plugins_sysinfo_unix_pci.c) = db2d20261419bed6d6c4b716b4416d73b3386053 SHA1 (patch-plugins_sysinfo_unix_pci.h) = 018b74796143b26d6a1f9ad821f3889b74b09cc8 +SHA1 (patch-src_common_meson.build) = 56f1376208c6ab198162d62ae990c8a6ed6c2b58 diff --git a/chat/hexchat/patches/patch-src_common_meson.build b/chat/hexchat/patches/patch-src_common_meson.build new file mode 100644 index 00000000000..1f096cd5ca8 --- /dev/null +++ b/chat/hexchat/patches/patch-src_common_meson.build @@ -0,0 +1,15 @@ +$NetBSD: patch-src_common_meson.build,v 1.1 2019/07/17 10:53:22 nia Exp $ + +Make generated headers an explicit dependency of targets using +hexchat_common to force the headers to be generated in time. + +--- src/common/meson.build.orig 2018-08-29 21:13:25.000000000 +0000 ++++ src/common/meson.build +@@ -109,6 +109,7 @@ hexchat_common = static_library('hexchat + ) + + hexchat_common_dep = declare_dependency( ++ sources: [textevents] + marshal, + link_with: hexchat_common, + include_directories: common_includes, + compile_args: common_cflags, |