pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rna-star: Successful compile on Darwin



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Sun Jul 23 13:06:33 2023 -0500
Changeset:	b037b372c82546bb1882be1a45b30b86b6f02cb8

Modified Files:
	rna-star/Makefile
	rna-star/distinfo
	rna-star/patches/patch-SharedMemory.cpp

Log Message:
rna-star: Successful compile on Darwin

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

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

diffstat:
 rna-star/Makefile                       | 5 +++++
 rna-star/distinfo                       | 2 +-
 rna-star/patches/patch-SharedMemory.cpp | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diffs:
diff --git a/rna-star/Makefile b/rna-star/Makefile
index a97df01ee6..7876c56058 100644
--- a/rna-star/Makefile
+++ b/rna-star/Makefile
@@ -63,6 +63,11 @@ do-install:
 # parallel/openmp installs an entire llvm
 # Maybe a libomp package would suffice?
 .if ${OPSYS} == Darwin
+SUBST_CLASSES+=		openmp
+SUBST_SED.openmp=	-e 's|-fopenmp|-Xpreprocessor &|g'
+SUBST_STAGE.openmp=	pre-configure
+SUBST_FILES.openmp=	Makefile
+LDFLAGS  += -L${PREFIX}/lib -lomp -pthread -lm
 .include "../../parallel/openmp/buildlink3.mk"
 .endif
 
diff --git a/rna-star/distinfo b/rna-star/distinfo
index 1dc9009a61..3ad597a1ce 100644
--- a/rna-star/distinfo
+++ b/rna-star/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (STAR-2.7.10b.tar.gz) = ae5b1c236c1b5975d60277dbd5634661a4598e6f3f906f3d
 SHA512 (STAR-2.7.10b.tar.gz) = c4e94fd19f2a8145c38d59b39d91af16b53af63da2d77275445b9aeadfd287e3d2749829352a034e45e4352c64884275fa5b7b2ed28b95bf47cac3183b0d74aa
 Size (STAR-2.7.10b.tar.gz) = 12443703 bytes
 SHA1 (patch-Makefile) = 7dd8ef0ba12182a4cb2722aacfc6691b4f0a0cfe
-SHA1 (patch-SharedMemory.cpp) = 42cd862f58f45ea09e63487ef4bd6baa00bbb25f
+SHA1 (patch-SharedMemory.cpp) = e4b97d68ddeb7ed2c7da66378f253ff4cd42abee
 SHA1 (patch-SoloBarcode.cpp) = a939a97cadd05b1ec6b6dfcddb469acd5072b0e8
 SHA1 (patch-SpliceGraph.cpp) = b51ff09c03c770ab39820159d76efebcddff12ec
 SHA1 (patch-SuffixArrayFuns.cpp) = b7c623c02277fdfc2bd9d6fa8068afafeb46b1cf
diff --git a/rna-star/patches/patch-SharedMemory.cpp b/rna-star/patches/patch-SharedMemory.cpp
index 6a202520e9..0e07847725 100644
--- a/rna-star/patches/patch-SharedMemory.cpp
+++ b/rna-star/patches/patch-SharedMemory.cpp
@@ -2,14 +2,14 @@ $NetBSD$
 
 # Portability
 
---- SharedMemory.cpp.orig	2023-07-23 17:37:47.154665669 +0000
+--- SharedMemory.cpp.orig	2022-11-01 14:50:35.000000000 +0000
 +++ SharedMemory.cpp
 @@ -12,7 +12,7 @@
  #include <errno.h>
  #include <sys/types.h>
  
 -#if defined(COMPILE_FOR_MAC) || defined(__FreeBSD__)
-+#if defined(COMPILE_FOR_MAC) || defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
    //some Mac's idiosyncrasies: standard SHM libraries are very old and missing some definitions
    #define SHM_NORESERVE 0
  #endif


Home | Main Index | Thread Index | Old Index