Merge branch 'master' of github.com:m-labs/artiq

This commit is contained in:
Sebastien Bourdeauducq 2015-08-18 09:59:54 +08:00
commit ed0a7632d9
3 changed files with 1 additions and 26 deletions

View File

@ -2,12 +2,6 @@ language: python
python: python:
- '3.4' - '3.4'
sudo: false sudo: false
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libstdc++6
env: env:
global: global:
- BUILD_SOC=1 - BUILD_SOC=1

View File

@ -27,7 +27,7 @@ test:
requires: requires:
- chardet - chardet
- gunicorn - gunicorn # [not win]
- nose - nose
about: about:

View File

@ -42,25 +42,6 @@ Then you can install the ARTIQ package, it will pull all the necessary dependenc
$ conda install artiq $ conda install artiq
.. note::
You need to have a recent libstdc++6.
If you are installing on e.g. Ubuntu 14.04 LTS: you need to update your
libstdc++6.
If the following command outputs `GLIBCXX_3.4.20`, then you don't need to
upgrade::
$ strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX_3.4.20
GLIBCXX_3.4.20
Adapt the previous command to the location of libstdc++ on your system.
To upgrade, on Ubuntu you need to do the following::
$ sudo add-apt-repository ppa:ubuntu-toolchain-r/test
$ sudo apt-get update
$ sudo apt-get install libstdc++6
Preparing the core device FPGA board Preparing the core device FPGA board
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^