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: ea5fbc9211e7
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: 6b9cc5a17c10
Choose a head ref
  • 4 commits
  • 7 files changed
  • 1 contributor

Commits on Oct 14, 2015

  1. conda: fix README.

    whitequark committed Oct 14, 2015
    Copy the full SHA
    fa9cbab View commit details
  2. conda: add lit package.

    whitequark committed Oct 14, 2015
    Copy the full SHA
    760ecb5 View commit details
  3. Copy the full SHA
    ca3a0fd View commit details
  4. Revert "travis: export llvm-or1k lib/ in LD_LIBRARY_PATH."

    This reverts commit 6d0ec2f.
    whitequark committed Oct 14, 2015
    Copy the full SHA
    6b9cc5a View commit details
Showing with 38 additions and 8 deletions.
  1. +3 −2 .travis/get-toolchain.sh
  2. +3 −4 conda/README.md
  3. +2 −0 conda/lit/bld.bat
  4. +1 −0 conda/lit/build.sh
  5. +27 −0 conda/lit/meta.yaml
  6. +1 −1 conda/llvmlite-artiq/build.sh
  7. +1 −1 conda/llvmlite-artiq/meta.yaml
5 changes: 3 additions & 2 deletions .travis/get-toolchain.sh
Original file line number Diff line number Diff line change
@@ -19,10 +19,11 @@ do
done

export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:$PATH
export LD_LIBRARY_PATH=$PWD/packages/usr/local/llvm-or1k/lib:$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:$LD_LIBRARY_PATH

echo "export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:\$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh
echo "export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:\$PATH" >> $HOME/.mlabs/build_settings.sh
echo "export LD_LIBRARY_PATH=$PWD/packages/usr/local/llvm-or1k/lib:$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:\$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh

or1k-linux-as --version
llc --version
clang --version
7 changes: 3 additions & 4 deletions conda/README.md
Original file line number Diff line number Diff line change
@@ -5,14 +5,13 @@ Preparing:

1. [Install miniconda][miniconda]
2. `conda update -q conda`
3. `conda install conda-build`
3. `conda install conda-build jinja2 anaconda`
4. `conda create -q -n py35 python=3.5`
5. `conda config --add channels https://conda.anaconda.org/m-labs/channel/dev`

Building:

1. `source activate py35`
2. `conda build pkgname --python 3.5`; this command displays a path to the freshly built package
3. `anaconda upload <package> -c main -c dev`
1. `conda build pkgname --python 3.5`; this command displays a path to the freshly built package
2. `anaconda upload <package> -c main -c dev`

[miniconda]: http://conda.pydata.org/docs/install/quick.html#linux-miniconda-install
2 changes: 2 additions & 0 deletions conda/lit/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"%PYTHON%" setup.py install
if errorlevel 1 exit 1
1 change: 1 addition & 0 deletions conda/lit/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$PYTHON setup.py install
27 changes: 27 additions & 0 deletions conda/lit/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package:
name: lit
version: 0.4.1

source:
fn: lit-0.4.1.tar.gz
url: https://pypi.python.org/packages/source/l/lit/lit-0.4.1.tar.gz
md5: ea6f00470e1bf7ed9e4edcff0f650fe6

build:
number: 0

requirements:
build:
- python
- setuptools

run:
- python

test:
commands:
- lit --version

about:
home: http://llvm.org/docs/CommandGuide/lit.html
license: MIT
2 changes: 1 addition & 1 deletion conda/llvmlite-artiq/build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install
$PYTHON setup.py install
2 changes: 1 addition & 1 deletion conda/llvmlite-artiq/meta.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ requirements:
- python

build:
number: 4
number: 5

test:
imports: