CVS commit: pkgsrc/textproc/openjade

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Apr 30 23:46:14 UTC 2020

Modified Files:
        pkgsrc/textproc/openjade: Makefile distinfo
Added Files:
        pkgsrc/textproc/openjade/patches: patch-style_Collector.h

Log Message:
Apply a similar hackaround for UB in libosp to clang. Bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/textproc/openjade/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/openjade/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/openjade/patches/patch-style_Collector.h

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

Modified files:

Index: pkgsrc/textproc/openjade/Makefile
diff -u pkgsrc/textproc/openjade/Makefile:1.37 pkgsrc/textproc/openjade/Makefile:1.38
--- pkgsrc/textproc/openjade/Makefile:1.37      Fri Mar 20 11:58:28 2020
+++ pkgsrc/textproc/openjade/Makefile   Thu Apr 30 23:46:13 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2020/03/20 11:58:28 nia Exp $
+# $NetBSD: Makefile,v 1.38 2020/04/30 23:46:13 joerg Exp $
 
 DISTNAME=      openjade-1.3.2
-PKGREVISION=   15
+PKGREVISION=   16
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openjade/}
 
@@ -45,6 +45,9 @@ INSTALLATION_DIRS=    ${OPENJADE_DATA_DIR}/
 # Work around the openjade bug by asking gcc not to eliminate the dead
 # stores that openjade relies on.
 #
+# Similar problems are seen with clang, so also mark the variable as
+# volatile.
+#
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
 CFLAGS+=       -fno-tree-dse

Index: pkgsrc/textproc/openjade/distinfo
diff -u pkgsrc/textproc/openjade/distinfo:1.17 pkgsrc/textproc/openjade/distinfo:1.18
--- pkgsrc/textproc/openjade/distinfo:1.17      Thu Mar 26 21:47:54 2020
+++ pkgsrc/textproc/openjade/distinfo   Thu Apr 30 23:46:13 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2020/03/26 21:47:54 rillig Exp $
+$NetBSD: distinfo,v 1.18 2020/04/30 23:46:13 joerg Exp $
 
 SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321
 RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2
@@ -14,4 +14,5 @@ SHA1 (patch-jade_HtmlFOTBuilder.cxx) = 9
 SHA1 (patch-jade_TeXFOTBuilder.cxx) = 037953d73d896afae7531e313821224ccd1e30e4
 SHA1 (patch-jade_TransformFOTBuilder.cxx) = cf4c51f05f95e31111a7e48d7984397ba4850e7d
 SHA1 (patch-msggen.pl) = d55befeb6f859c9c3330c2083fce5d5281a496ef
+SHA1 (patch-style_Collector.h) = b07289e9b2011f8059c68794aee803b0f278fd3f
 SHA1 (patch-style_primitive.cxx) = a7f3328c436c9a73805cdd1abb4321f156b94c6e

Added files:

Index: pkgsrc/textproc/openjade/patches/patch-style_Collector.h
diff -u /dev/null pkgsrc/textproc/openjade/patches/patch-style_Collector.h:1.1
--- /dev/null   Thu Apr 30 23:46:14 2020
+++ pkgsrc/textproc/openjade/patches/patch-style_Collector.h    Thu Apr 30 23:46:13 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-style_Collector.h,v 1.1 2020/04/30 23:46:13 joerg Exp $
+
+See Makefile.
+
+--- style/Collector.h.orig     2020-04-30 00:27:45.776360891 +0000
++++ style/Collector.h
+@@ -140,7 +140,7 @@ void *Collector::allocateObject(bool has
+ {
+   if (freePtr_ == &allObjectsList_)
+     makeSpace();
+-  Object *tem = freePtr_;
++  Object * volatile tem = freePtr_;
+   freePtr_ = freePtr_->next();
+   tem->setColor(currentColor_);
+   tem->hasFinalizer_ = hasFinalizer;