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.

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

Update breseq to v0.32.1 #9344

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion recipes/breseq/build.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
#!/bin/bash
#!/usr/bin/env bash

set -x -e


export CFLAGS="-I$PREFIX/include"
export LDFLAGS="-L$PREFIX/lib"
export CPATH=${PREFIX}/include

gcc -v

mkdir -p $PREFIX/bin
./configure --prefix=${PREFIX}
make
Expand Down
22 changes: 22 additions & 0 deletions recipes/breseq/disable-compiler-version-check.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/src/c/breseq/libbreseq/json.hpp b/src/c/breseq/libbreseq/json.hpp
index a39dc5af..d6aaa5e5 100644
--- a/src/c/breseq/libbreseq/json.hpp
+++ b/src/c/breseq/libbreseq/json.hpp
@@ -57,17 +57,6 @@ SOFTWARE.
#include <utility> // declval, forward, make_pair, move, pair, swap
#include <vector> // vector

-// exclude unsupported compilers
-#if defined(__clang__)
- #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
- #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
- #endif
-#elif defined(__GNUC__)
- #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900
- #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
- #endif
-#endif
-
// disable float-equal warnings on GCC/clang
#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
#pragma GCC diagnostic push
21 changes: 13 additions & 8 deletions recipes/breseq/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
{% set name = "breseq" %}
{% set version = "0.31.1" %}
{% set version = "0.32.1" %}
{% set sha256 = "c017c2641459975e66f46218475d56629d6ac4a6834657d1fc973be52e82d17f" %}

package:
name: {{ name|lower }}
version: {{ version }}
name: breseq
version: '{{version}}'

build:
number: 3
number: 0
patches:
- disable-compiler-version-check.patch

source:
url: https://github.com/barricklab/breseq/releases/download/v{{ version }}/breseq-{{ version }}-Source.tar.gz
sha256: 52471eb1c90b1b564243ad6d1c668a82a5539ef742b0badbbb9c7b3fcc2afac3
sha256: {{ sha256 }}

requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
host:
- zlib
run:
Expand All @@ -29,6 +32,8 @@ test:

about:
home: https://github.com/barricklab/breseq
license: GPLv3
license: GPL-3.0
license_file: COPYING
summary: 'A computational pipeline for finding mutations relative to a reference sequence in short-read DNA re-sequencing data.'
license_family: GPL
summary: A computational pipeline for finding mutations relative to a reference
sequence in short-read DNA re-sequencing data.