Date: Mon, 11 Jan 2021 17:39:52 +0000 (UTC) From: "Jason W. Bacon" <jwb@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561235 - in head/biology/star: . files Message-ID: <202101111739.10BHdqsu057248@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jwb Date: Mon Jan 11 17:39:52 2021 New Revision: 561235 URL: https://svnweb.freebsd.org/changeset/ports/561235 Log: biology/star: Drop dependency on gcc Replace compiler:openmp with compiler:c++11-lang and localbase PR: port/247753, ports/252379 Modified: head/biology/star/Makefile head/biology/star/files/patch-Makefile (contents, props changed) Modified: head/biology/star/Makefile ============================================================================== --- head/biology/star/Makefile Mon Jan 11 17:27:30 2021 (r561234) +++ head/biology/star/Makefile Mon Jan 11 17:39:52 2021 (r561235) @@ -2,6 +2,7 @@ PORTNAME= STAR DISTVERSION= 2.7.3a +PORTREVISION= 1 CATEGORIES= biology PKGNAMEPREFIX= rna- @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKDIR}/STAR-${DISTVERSION}/LICENSE # 64-bit only, needs 16+ GiB RAM for typical eukaryotic genome NOT_FOR_ARCHS= i386 powerpc -USES= compiler:openmp gmake +USES= compiler:c++11-lang gmake USE_GITHUB= yes GH_ACCOUNT= alexdobin @@ -22,14 +23,7 @@ WRKSRC_SUBDIR= source PLIST_FILES= bin/STAR -.include <bsd.port.pre.mk> - -# Force newer compiler on platforms using GCC 4.2 as base -.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 -USE_GCC= yes -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/STAR ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/biology/star/files/patch-Makefile ============================================================================== --- head/biology/star/files/patch-Makefile Mon Jan 11 17:27:30 2021 (r561234) +++ head/biology/star/files/patch-Makefile Mon Jan 11 17:39:52 2021 (r561235) @@ -1,17 +1,23 @@ ---- Makefile.orig 2019-03-28 20:48:16 UTC +--- Makefile.orig 2019-10-08 19:10:51 UTC +++ Makefile -@@ -20,11 +20,11 @@ LDFLAGS_gdb := $(LDFLAGS_shared) +@@ -20,11 +20,16 @@ LDFLAGS_gdb := $(LDFLAGS_shared) COMPTIMEPLACE := -D'COMPILATION_TIME_PLACE="$(shell echo `date` $(HOSTNAME):`pwd`)"' -CXXFLAGS_common := -pipe -std=c++11 -Wall -Wextra -fopenmp $(COMPTIMEPLACE) -CXXFLAGS_main := -O3 $(CXXFLAGS_common) -+CXXFLAGS_common := -std=c++11 -Wall -Wextra -fopenmp $(COMPTIMEPLACE) -+CXXFLAGS_main += $(CXXFLAGS_common) - CXXFLAGS_gdb := -O0 -g $(CXXFLAGS_common) +-CXXFLAGS_gdb := -O0 -g $(CXXFLAGS_common) ++# Defaults, overridden by make arguments or environment ++CXXFLAGS ?= -pipe -O3 -Wall -Wextra ++CFLAGS ?= -pipe -O3 -Wall -Wextra -CFLAGS := -O3 -pipe -Wall -Wextra $(CFLAGS) -+CFLAGS += -Wall -Wextra ++# Unconditionally set essential flags ++CXXFLAGS_common := -std=c++11 -fopenmp $(COMPTIMEPLACE) ++CXXFLAGS_main += $(CXXFLAGS_common) ++ ++# -O or -O2 should work fine with gdb as well ++CXXFLAGS_gdb := -O0 -g $(CXXFLAGS_common) ##########################################################################################################
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101111739.10BHdqsu057248>