canu: Work on Darwin compatibility

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri May 19 07:06:49 2023 -0500
Changeset:	8b2795380092a9570a78f187239796189f520858

Modified Files:
	canu/Makefile
	canu/distinfo
	canu/patches/patch-Makefile

Log Message:
canu: Work on Darwin compatibility

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8b2795380092a9570a78f187239796189f520858

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

diffstat:
 canu/Makefile               |  2 ++
 canu/distinfo               |  2 +-
 canu/patches/patch-Makefile | 60 +++++++++++++++++++++++++++++++++++++++------
 3 files changed, 56 insertions(+), 8 deletions(-)

diffs:
diff --git a/canu/Makefile b/canu/Makefile
index c8e1ad7ddd..d766493d9c 100644
--- a/canu/Makefile
+++ b/canu/Makefile
@@ -48,6 +48,7 @@ USE_LANGUAGES=	c c++
 USE_JAVA=	run
 USE_JAVA2=	8
 USE_TOOLS+=	gmake pax perl
+GCC_REQD+=	12
 
 WRKSRC=		${WRKDIR}/canu-${PKGVERSION_NOREV}/src
 MAKE_ENV+=	DESTDIR=${WRKSRC}
@@ -73,4 +74,5 @@ do-install:
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/simde/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
+.include "../../parallel/openmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/canu/distinfo b/canu/distinfo
index 81bd3672ca..8897dd33f9 100644
--- a/canu/distinfo
+++ b/canu/distinfo
@@ -3,7 +3,7 @@ $NetBSD$
 BLAKE2s (canu-2.2.tar.xz) = 5b585a2e0a31c2181817798b5f267dd4cf43c3ffeba4b0a04ffc8021a4603aed
 SHA512 (canu-2.2.tar.xz) = af08874a319dd5fd6bbe666c8a5d0a43b7c0caaaca3a3cbf4d3fe022d6d6b8c14cd967c2e26f4fbf571129be240dcb65e92fe61fad1e51d554f15254d0b6ce8f
 Size (canu-2.2.tar.xz) = 2400192 bytes
-SHA1 (patch-Makefile) = aa83003677cbb12558e438c776402ec48df0598d
+SHA1 (patch-Makefile) = 8a42be006f16fe20289fa80a68f1abdf61bea1b0
 SHA1 (patch-pipelines_canu_Defaults.pm) = 5ecea8ebac667499916b0243f34dc25838992444
 SHA1 (patch-pipelines_canu_Execution.pm) = 75c019a93f5b6a4491191b4f32931ac0b8435421
 SHA1 (patch-utgcns_libboost_boost_smart__ptr_detail_shared__count.hpp) = fd219645141ebe9d6f23153a2a2b0f56abc103af
diff --git a/canu/patches/patch-Makefile b/canu/patches/patch-Makefile
index b72ea568ae..e278fad2dd 100644
--- a/canu/patches/patch-Makefile
+++ b/canu/patches/patch-Makefile
@@ -1,11 +1,57 @@
 $NetBSD$
 
-# Template Makefile requires platform-specific defaults for each OS
-# To be sent upstream following commit
+# Disable Darwin clang block since pkgsrc provides a workaround
 
---- Makefile.orig	2018-10-22 16:47:31.000000000 +0000
+--- Makefile.orig	2021-08-04 00:21:51.000000000 +0000
 +++ Makefile
-@@ -545,6 +545,40 @@ endif
+@@ -418,12 +418,12 @@ endif
+ ifeq ($(origin CXXFLAGS), undefined)
+   ifeq ($(BUILDOPTIMIZED), 1)
+   else
+-    CXXFLAGS += -g3
++    CXXFLAGS += 
+   endif
+ 
+   ifeq ($(BUILDDEBUG), 1)
+   else
+-    CXXFLAGS += -O4 -funroll-loops -fexpensive-optimizations -finline-functions -fomit-frame-pointer
++    CXXFLAGS +=     -fomit-frame-pointer
+   endif
+ 
+   ifeq ($(BUILDJEMALLOC), 1)
+@@ -497,25 +497,6 @@ endef
+ ifeq (${OSTYPE}, Darwin)
+   $(foreach suffix,mp-9 9  mp-8 8  mp-7 7,$(eval $(call TEST_COMPILER,${suffix})))
+ 
+-  ifneq ($(shell echo `$(CXX) --version 2>&1 | grep -c clang`), 0)
+-     CPATH := $(shell echo `which $(CXX)`)
+-     CLANG := $(shell echo `$(CXX) --version 2>&1 | grep clang`)
+-     space := 
+-
+-     $(warning )
+-     ifeq ($(CXX), $(CPATH))
+-       $(warning Compiler '$(CXX)' reports version '$(CLANG)'.)
+-     else
+-       $(warning Compiler '$(CXX)' at '$(CPATH)' reports version '$(CLANG)'.)
+-     endif
+-     $(warning )
+-     $(warning Canu cannot be compiled with this compiler.  Please install GCC and/or)
+-     $(warning specify a non-Clang compiler on the command line, e.g.,)   #  Quite the evil trick to get
+-     $(warning $(space)    make CC=/path/to/gcc CXX=/path/to/g++);        #  this line indented!
+-     $(warning )
+-     $(error unsupported compiler)
+-  endif
+-
+   CXXFLAGS += -fopenmp -pthread -fPIC -m64 -Wno-format
+   LDFLAGS  += -fopenmp -pthread -lm
+ endif
+@@ -559,11 +540,45 @@ else
+   #LDFLAGS   += -lprofiler
+ 
+   #  callgrind
+-  #CXXFLAGS  += -g3 -Wa,--gstabs -save-temps
++  #CXXFLAGS  +=  -Wa,--gstabs -save-temps
+ endif
  endif
  
  
@@ -29,16 +75,16 @@ $NetBSD$
 +  #LDFLAGS   += -lprofiler
 +
 +  #  callgrind
-+  #CXXFLAGS  += -g3 -Wa,--gstabs -save-temps
++  #CXXFLAGS  +=  -Wa,--gstabs -save-temps
 +
 +  ifeq ($(BUILDOPTIMIZED), 1)
 +  else
-+    CXXFLAGS += -g3
++    CXXFLAGS += 
 +  endif
 +
 +  ifeq ($(BUILDDEBUG), 1)
 +  else
-+    CXXFLAGS += -O3   -finline-functions -fomit-frame-pointer
++    CXXFLAGS +=     -fomit-frame-pointer
 +  endif
 +endif
 +