biology/star: Fix SIMD issue on non-amd64

Also remove some extraneous build flags from upstream Makefile

PR:             273240
Reported by:    dizzy
This commit is contained in:
Jason W. Bacon
2023-08-21 09:33:20 -05:00
parent f0f8433228
commit 0e8f22496e
2 changed files with 9 additions and 12 deletions
+2 -7
View File
@@ -1,5 +1,6 @@
PORTNAME= STAR
DISTVERSION= 2.7.11a
PORTREVISION= 1
CATEGORIES= biology
PKGNAMEPREFIX= rna-
@@ -26,7 +27,7 @@ USE_GITHUB= yes
GH_ACCOUNT= alexdobin
WRKSRC_SUBDIR= source
MAKE_FLAGS= HTSLIB=''
MAKE_FLAGS= HTSLIB='' CXXFLAGS_SIMD=""
PLIST_FILES= bin/STAR
@@ -44,12 +45,6 @@ post-patch:
${WRKSRC}/bam_cat.h \
${WRKSRC}/signalFromBAM.h
.include <bsd.port.options.mk>
.if ${ARCH} != amd64
MAKE_FLAGS+= CXXFLAGS_SIMD=""
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/STAR ${STAGEDIR}${PREFIX}/bin
+7 -5
View File
@@ -1,6 +1,6 @@
--- Makefile.orig 2022-11-01 14:50:35 UTC
--- Makefile.orig 2023-08-15 19:21:58 UTC
+++ Makefile
@@ -11,6 +11,10 @@ CXXFLAGSextra ?=
@@ -11,14 +11,19 @@ CXXFLAGSextra ?=
# user may define the compiler
CXX ?= g++
@@ -9,9 +9,11 @@
+HTSLIB ?= htslib
+
# pre-defined flags
LDFLAGS_shared := -pthread -Lhtslib -Bstatic -lhts -Bdynamic -lz
LDFLAGS_static := -static -static-libgcc -pthread -Lhtslib -lhts -lz
@@ -18,7 +22,8 @@ LDFLAGS_Mac :=-pthread -lz htslib/libhts.a
-LDFLAGS_shared := -pthread -Lhtslib -Bstatic -lhts -Bdynamic -lz
-LDFLAGS_static := -static -static-libgcc -pthread -Lhtslib -lhts -lz
+LDFLAGS_shared := -pthread -lhts -lz
+LDFLAGS_static := -static -pthread -lhts -lz
LDFLAGS_Mac :=-pthread -lz htslib/libhts.a
LDFLAGS_Mac_static :=-pthread -lz -static-libgcc htslib/libhts.a
LDFLAGS_gdb := $(LDFLAGS_shared)