Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cd199f16eccb
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c94dafdecab1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 17, 2015

  1. Revert "manual: llvmlite-artiq conda package needs a recent libstdc++6" 

    This reverts commit 8669f1d.
This is no longer needed since the llvmlite-artiq package for
linux-64 has been rebuilt on an older Ubuntu (14.04 LTS)
    @fallen
    fallen committed Aug 17, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a0f1b02 View commit details

  2. Revert "travis: use more recent libstdc++" 

    This reverts commit 075bf33.
This is no longer needed since the llvmlite-artiq package for
linux-64 has been rebuilt on an older Ubuntu (14.04 LTS)
    @fallen
    fallen committed Aug 17, 2015
    Copy the full SHA
    c94dafd View commit details
Showing with 0 additions and 25 deletions.
  1. +0 −6 .travis.yml
  2. +0 −19 doc/manual/installing.rst
6 changes: 0 additions & 6 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,6 @@ language: python
python:
- '3.4'
sudo: false
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libstdc++6
env:
global:
- BUILD_SOC=1
19 changes: 0 additions & 19 deletions doc/manual/installing.rst
View file
Original file line number Diff line number Diff line change
@@ -42,25 +42,6 @@ Then you can install the ARTIQ package, it will pull all the necessary dependenc

$ 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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^