diff --git a/recipes/breseq/build.sh b/recipes/breseq/build.sh index e9e296ababe78..f3700bd7c9d5c 100644 --- a/recipes/breseq/build.sh +++ b/recipes/breseq/build.sh @@ -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 diff --git a/recipes/breseq/disable-compiler-version-check.patch b/recipes/breseq/disable-compiler-version-check.patch new file mode 100644 index 0000000000000..80255ab9f5750 --- /dev/null +++ b/recipes/breseq/disable-compiler-version-check.patch @@ -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 // declval, forward, make_pair, move, pair, swap + #include // 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 diff --git a/recipes/breseq/meta.yaml b/recipes/breseq/meta.yaml index 4708bd8bacacf..e23d280c63739 100644 --- a/recipes/breseq/meta.yaml +++ b/recipes/breseq/meta.yaml @@ -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: @@ -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.