From 4a907dcb33faec0e5f15208ad5d4becac486b41d Mon Sep 17 00:00:00 2001 From: Yann Sionneau Date: Tue, 1 Sep 2015 12:13:24 +0200 Subject: [PATCH] conda: add binutils-or1k-linux dependency to artiq package --- .travis/get-toolchain.sh | 2 +- conda/artiq/meta.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis/get-toolchain.sh b/.travis/get-toolchain.sh index 9b0ca48cc..73c268d0a 100755 --- a/.travis/get-toolchain.sh +++ b/.travis/get-toolchain.sh @@ -1,7 +1,7 @@ #!/bin/sh packages="http://us.archive.ubuntu.com/ubuntu/pool/universe/i/iverilog/iverilog_0.9.7-1_amd64.deb" -archives="http://fehu.whitequark.org/files/binutils-or1k.tbz2 http://fehu.whitequark.org/files/llvm-or1k.tbz2" +archives="http://fehu.whitequark.org/files/llvm-or1k.tbz2" mkdir -p packages diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 192193bce..708aea045 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -33,6 +33,7 @@ requirements: - numpy - migen - pyelftools + - binutils-or1k-linux run: - python >=3.4.3 - llvmlite-artiq @@ -51,6 +52,7 @@ requirements: - flterm # [linux] - pygit2 - aiohttp + - binutils-or1k-linux test: imports: