Skip to content

Commit 3829182

Browse files
committed
Add aarch64, ppc64le and s390x cases to Travis CI.
Update Makefile.
1 parent f484e66 commit 3829182

File tree

2 files changed

+42
-9
lines changed

2 files changed

+42
-9
lines changed

.travis.yml

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,35 @@
1-
language: c++
1+
dist: xenial
2+
language: cpp
3+
matrix:
4+
include:
5+
- arch: arm64
6+
compiler: gcc
7+
env:
8+
- POPCNT_CAPABILITY=0
9+
- arch: ppc64le
10+
compiler: gcc
11+
env:
12+
- POPCNT_CAPABILITY=0
13+
- arch: s390x
14+
# As libtbb-dev package is not available on xenial s390x, use bionic.
15+
# https://packages.ubuntu.com/xenial/libtbb-dev
16+
dist: bionic
17+
compiler: gcc
18+
env:
19+
- POPCNT_CAPABILITY=0
20+
# make simple-test fails on s390x.
21+
# ./bowtie-build --threads 2 --quiet --sanity .simple_tests.pl.fa .simple_tests.tmp
22+
# Bad exitlevel from bowtie-build: 139 at ./scripts/test/simple_tests.pl line 1141.
23+
script: make allall
224
compiler:
3-
- clang
4-
- gcc
25+
- clang
26+
- gcc
527
cache: apt
628
addons:
729
apt:
830
packages:
9-
- libtbb-dev
31+
- libtbb-dev
1032
script: make allall && make simple-test
1133
notifications:
12-
slack:
13-
secure: K/SdL+S1lb+Vf3KucmiMh4Fyd9sWmosw+mSRjtAjAzXUYZ3zMp91bM6GzHVD1nonMQWDu3vY6TOApvnikSfd4ZSRhO4ijDda5zF3SN19Uly4vXRTC0C4UKloyVqOjx2uwXU4Mz+7cuO9RCb4CczL2HUG9tiLN5BjfbnHvQlZzsE6dJuo+5BoKq88SbNhlBlGIuLWAsVmpnaozNjowNBLb2+BtrK5KSN5eTyCVerZeoJ2ChexDXGf7SnGVQhgu05hfOB52ti1mzRaTRGY91jnKAibBaO/gyW2Q5/AeBy+OrL5poenM0rAJHjztUCw1lC1G4Mej73YyHn6V1NF0DHSYM9l8aBe0nAweAuB4tuRJ9gJtqR6GjXdqURI5ABBsFIkb9pNbJz59g9sTpKrrWmIqqj7a8Eld7nk1K+IjBVOvDT9x3PWjl/H1sAl+0bRT42lu+zjJV9BIn/Fwn+xC0syRazgDimkfPLbn/aAEBKeofwdk/DHb3amBtbHsEFZsAdI5Mrq/tIuCYO0i7jYxlmNTNsXA5a0gF1OExGJvPPDV2/lp/bPx/ncvcZvwjpst6BEyJURmM5MsMCeHbiuPvlVmA4R29BTMBaW/ZN5smF4E+CkV2IxPlpgh2c+YSX44ikYnG3v4H5QKxLI4W4E+TTn9/1EmdO0KMzNG8gEiNnKcTg=
34+
slack:
35+
secure: K/SdL+S1lb+Vf3KucmiMh4Fyd9sWmosw+mSRjtAjAzXUYZ3zMp91bM6GzHVD1nonMQWDu3vY6TOApvnikSfd4ZSRhO4ijDda5zF3SN19Uly4vXRTC0C4UKloyVqOjx2uwXU4Mz+7cuO9RCb4CczL2HUG9tiLN5BjfbnHvQlZzsE6dJuo+5BoKq88SbNhlBlGIuLWAsVmpnaozNjowNBLb2+BtrK5KSN5eTyCVerZeoJ2ChexDXGf7SnGVQhgu05hfOB52ti1mzRaTRGY91jnKAibBaO/gyW2Q5/AeBy+OrL5poenM0rAJHjztUCw1lC1G4Mej73YyHn6V1NF0DHSYM9l8aBe0nAweAuB4tuRJ9gJtqR6GjXdqURI5ABBsFIkb9pNbJz59g9sTpKrrWmIqqj7a8Eld7nk1K+IjBVOvDT9x3PWjl/H1sAl+0bRT42lu+zjJV9BIn/Fwn+xC0syRazgDimkfPLbn/aAEBKeofwdk/DHb3amBtbHsEFZsAdI5Mrq/tIuCYO0i7jYxlmNTNsXA5a0gF1OExGJvPPDV2/lp/bPx/ncvcZvwjpst6BEyJURmM5MsMCeHbiuPvlVmA4R29BTMBaW/ZN5smF4E+CkV2IxPlpgh2c+YSX44ikYnG3v4H5QKxLI4W4E+TTn9/1EmdO0KMzNG8gEiNnKcTg=

Makefile

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ bindir = $(prefix)/bin
88
SEQAN_DIR = ./SeqAn-1.1
99
# treat SeqAn as a sysdir to suppress warnings
1010
SEQAN_INC = -isystem $(SEQAN_DIR)
11-
INC = $(if $(RELEASE_BUILD),-I$(CURDIR)/.include) $(SEQAN_INC) -I third_party
11+
INC = $(if $(RELEASE_BUILD),-I$(CURDIR)/.include) $(SEQAN_INC)
1212
CPP = g++
1313
CXX = $(CPP)
1414
CC = gcc
@@ -162,6 +162,12 @@ VERSION = $(shell cat VERSION)
162162
BITS=32
163163
ifeq (x86_64,$(shell uname -m))
164164
BITS=64
165+
else ifeq (aarch64,$(shell uname -m))
166+
BITS=64
167+
else ifeq (s390x,$(shell uname -m))
168+
BITS=64
169+
else ifeq (ppc64le,$(shell uname -m))
170+
BITS=64
165171
endif
166172
# msys will always be 32 bit so look at the cpu arch instead.
167173
ifneq (,$(findstring AMD64,$(PROCESSOR_ARCHITEW6432)))
@@ -180,8 +186,13 @@ ifeq (32,$(BITS))
180186
$(error bowtie2 compilation requires a 64-bit platform )
181187
endif
182188

183-
DEBUG_FLAGS = -O0 -g3 -m64
184-
RELEASE_FLAGS = -O3 -m64
189+
M64_FLAG := -m64
190+
ifeq (aarch64,$(shell uname -m))
191+
M64_FLAG =
192+
endif
193+
194+
DEBUG_FLAGS = -O0 -g3 $(M64_FLAG)
195+
RELEASE_FLAGS = -O3 $(M64_FLAG)
185196
NOASSERT_FLAGS = -DNDEBUG
186197
FILE_FLAGS = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
187198

0 commit comments

Comments
 (0)