<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/66976b72735d47cfefd6b3a07b2ec0807af20489">https://github.com/macports/macports-ports/commit/66976b72735d47cfefd6b3a07b2ec0807af20489</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 66976b72735d47cfefd6b3a07b2ec0807af20489
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jan 19 07:40:05 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> bowtie: respect MacPorts compiler flags
</span>---
science/bowtie/Portfile | 13 +++++++-----
science/bowtie/files/patch-Makefile.diff | 34 ++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/bowtie/Portfile b/science/bowtie/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 78b8001..dad65e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/bowtie/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/bowtie/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name bowtie
version 0.12.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories science biology
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,14 +28,17 @@ checksums rmd160 e75b41d3cfa0ff69bf4cc19038613d15a8702c5d \
</span> sha256 61012d45dca1c782d8907f7f7ab1a45518687d4ea6d9baa8bebcde79e1053761 \
size 7701615
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Makefile.diff
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replicate values from Makefile prior to patching
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.optflags -O3
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC=${configure.cc} CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_FLAGS="[get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd printenv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args {>> Makefile.macports.inc}
</span>
destroot {
xinstall -W ${worksrcpath} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/bowtie/files/patch-Makefile.diff b/science/bowtie/files/patch-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..907e4a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/bowtie/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Respect MacPorts compiler & compiler flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2012-12-14 20:15:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2019-01-19 07:27:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,14 +2,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Makefile for bowtie, bowtie-build, bowtie-inspect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include Makefile.macports.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SEQAN_DIR = SeqAn-1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SEQAN_INC = -I $(SEQAN_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INC = $(SEQAN_INC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_PREFIX = $(shell dirname `which gcc`)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_SUFFIX =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = $(GCC_PREFIX)/gcc$(GCC_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CPP = $(GCC_PREFIX)/g++$(GCC_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX = $(CPP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC ?= $(GCC_PREFIX)/gcc$(GCC_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXX ?= $(GCC_PREFIX)/g++$(GCC_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CPP ?= $(CXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS = $(wildcard *.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOWTIE_PTHREADS = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOWTIE_MM = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,8 +101,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BITS_FLAG = -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEBUG_FLAGS = -O0 -g3 $(BITS_FLAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-RELEASE_FLAGS = -O3 $(BITS_FLAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEBUG_FLAGS = $(BITS_FLAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++RELEASE_FLAGS = $(BITS_FLAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NOASSERT_FLAGS = -DNDEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE_FLAGS = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>