Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jun 2023 12:01:17 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b27d05a94c64 - main - biology/hyphy: fix build on armv7
Message-ID:  <202306301201.35UC1HGG044543@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b27d05a94c645a3ba02c50122a229c37bec42559

commit b27d05a94c645a3ba02c50122a229c37bec42559
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-06-29 08:33:12 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-06-30 12:00:28 +0000

    biology/hyphy: fix build on armv7
    
    With OpenMP not present, the code had a duplicate function definition.
    Get rid of one of the two to enable a build on armv7.
    
    Approved by:    portmgr (build fix blanket)
---
 biology/hyphy/files/patch-src_core_include_likefunc.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/biology/hyphy/files/patch-src_core_include_likefunc.h b/biology/hyphy/files/patch-src_core_include_likefunc.h
new file mode 100644
index 000000000000..bd2ab76cc7cb
--- /dev/null
+++ b/biology/hyphy/files/patch-src_core_include_likefunc.h
@@ -0,0 +1,12 @@
+--- src/core/include/likefunc.h.orig	2023-06-27 12:50:39 UTC
++++ src/core/include/likefunc.h
+@@ -282,9 +282,6 @@ class   _LikelihoodFunction: public BaseObj { (public)
+     long        GetThreadCount            (void) {
+         return 1L;
+     }
+-    void        SetThreadCount            (long) {
+-        
+-    }
+ #endif
+ #endif
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306301201.35UC1HGG044543>