From a0f1b02eb511bbd53c830ee7eef2faa681c5ce5b Mon Sep 17 00:00:00 2001 From: Yann Sionneau Date: Mon, 17 Aug 2015 17:50:19 +0200 Subject: [PATCH] Revert "manual: llvmlite-artiq conda package needs a recent libstdc++6" This reverts commit 8669f1d61db7cacc676db464ffbcd54b76e3e8e0. This is no longer needed since the llvmlite-artiq package for linux-64 has been rebuilt on an older Ubuntu (14.04 LTS) --- doc/manual/installing.rst | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index b95dadb42..9d7523205 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^