Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix octopus binary "invalid instruction" (-march too new) #11822

Merged
merged 2 commits into from
Nov 17, 2018
Merged

Fix octopus binary "invalid instruction" (-march too new) #11822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fcf531
This attempts to make the binary more portable by only requiring Sand…
holtgrewe Nov 8, 2018
93ef507
Fix march set to native
epruesse Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions recipes/octopus/fix_march_set_to_native.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -rNu octopus-0.5.2-beta.orig/src/CMakeLists.txt octopus-0.5.2-beta/src/CMakeLists.txt
--- octopus-0.5.2-beta.orig/src/CMakeLists.txt 2018-10-29 08:36:32.000000000 -0600
+++ octopus-0.5.2-beta/src/CMakeLists.txt 2018-11-13 15:54:06.000000000 -0700
@@ -639,7 +639,7 @@
else()
add_executable(octopus main.cpp ${OCTOPUS_SOURCES} ${INCLUDE_SOURCES})
target_compile_features(octopus PRIVATE cxx_thread_local)
- target_compile_options(octopus PRIVATE -ffast-math -funroll-loops -march=native)
+ target_compile_options(octopus PRIVATE -ffast-math -funroll-loops)
target_include_directories(octopus PUBLIC ${octopus_SOURCE_DIR}/lib ${octopus_SOURCE_DIR}/src)
target_link_libraries(octopus tandem ranger)
if (NOT BUILD_SHARED_LIBS)
4 changes: 3 additions & 1 deletion recipes/octopus/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ package:
version: {{ version }}

build:
number: 0
number: 1
# Not building on osx CircleCI and unsure how to fix; does not pick
# up 7.2 compilers
skip: true # [osx]

source:
url: https://github.com/luntergroup/{{ name }}/archive/v0.5.2-beta.tar.gz
sha256: {{ sha256 }}
patches:
- fix_march_set_to_native.patch

requirements:
build:
Expand Down