From fa9cbab77ad6fb8dae6fd51d0eeaea58147744df Mon Sep 17 00:00:00 2001 From: whitequark Date: Wed, 14 Oct 2015 03:06:10 +0300 Subject: [PATCH 1/6] conda: fix README. --- conda/README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conda/README.md b/conda/README.md index e37f241c8..017742a8b 100644 --- a/conda/README.md +++ b/conda/README.md @@ -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 -c main -c dev` + 1. `conda build pkgname --python 3.5`; this command displays a path to the freshly built package + 2. `anaconda upload -c main -c dev` [miniconda]: http://conda.pydata.org/docs/install/quick.html#linux-miniconda-install From 760ecb5308f41d0f751e443d975d7f39109354e3 Mon Sep 17 00:00:00 2001 From: whitequark Date: Wed, 14 Oct 2015 03:06:32 +0300 Subject: [PATCH 2/6] conda: add lit package. --- conda/lit/bld.bat | 2 ++ conda/lit/build.sh | 1 + conda/lit/meta.yaml | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 conda/lit/bld.bat create mode 100644 conda/lit/build.sh create mode 100644 conda/lit/meta.yaml diff --git a/conda/lit/bld.bat b/conda/lit/bld.bat new file mode 100644 index 000000000..c40a9bbef --- /dev/null +++ b/conda/lit/bld.bat @@ -0,0 +1,2 @@ +"%PYTHON%" setup.py install +if errorlevel 1 exit 1 diff --git a/conda/lit/build.sh b/conda/lit/build.sh new file mode 100644 index 000000000..5a5aeeb48 --- /dev/null +++ b/conda/lit/build.sh @@ -0,0 +1 @@ +$PYTHON setup.py install diff --git a/conda/lit/meta.yaml b/conda/lit/meta.yaml new file mode 100644 index 000000000..14cf41555 --- /dev/null +++ b/conda/lit/meta.yaml @@ -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 From ca3a0fd73b0432a4fef08ac8e15f1edd27230ce7 Mon Sep 17 00:00:00 2001 From: whitequark Date: Wed, 14 Oct 2015 14:49:13 +0300 Subject: [PATCH 3/6] conda: llvmlite-artiq: do not use LLVM from /usr/local/llvm-or1k. --- conda/llvmlite-artiq/build.sh | 2 +- conda/llvmlite-artiq/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/llvmlite-artiq/build.sh b/conda/llvmlite-artiq/build.sh index d3b3bbe2c..8e25a1455 100755 --- a/conda/llvmlite-artiq/build.sh +++ b/conda/llvmlite-artiq/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install +$PYTHON setup.py install diff --git a/conda/llvmlite-artiq/meta.yaml b/conda/llvmlite-artiq/meta.yaml index 56063b261..8da703559 100644 --- a/conda/llvmlite-artiq/meta.yaml +++ b/conda/llvmlite-artiq/meta.yaml @@ -15,7 +15,7 @@ requirements: - python build: - number: 4 + number: 5 test: imports: From 6b9cc5a17c1044f3f656b6bbbd8b84416c206149 Mon Sep 17 00:00:00 2001 From: whitequark Date: Wed, 14 Oct 2015 14:49:30 +0300 Subject: [PATCH 4/6] Revert "travis: export llvm-or1k lib/ in LD_LIBRARY_PATH." This reverts commit 6d0ec2f01d5bbdd55db0158edd1a1c03959e8f76. --- .travis/get-toolchain.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis/get-toolchain.sh b/.travis/get-toolchain.sh index 9b62ad225..73c268d0a 100755 --- a/.travis/get-toolchain.sh +++ b/.travis/get-toolchain.sh @@ -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 From d033745f423c7312b2ac03a0534175a412bf855f Mon Sep 17 00:00:00 2001 From: whitequark Date: Wed, 14 Oct 2015 15:45:07 +0300 Subject: [PATCH 5/6] conda: llvmdev-or1k: bump. --- conda/llvmdev-or1k/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/llvmdev-or1k/meta.yaml b/conda/llvmdev-or1k/meta.yaml index f7799c7c9..09ca7046a 100644 --- a/conda/llvmdev-or1k/meta.yaml +++ b/conda/llvmdev-or1k/meta.yaml @@ -7,7 +7,7 @@ source: git_tag: master build: - number: 4 + number: 5 requirements: build: From da4a6a2e64bb5bc29b77b3dcb90996fb06def571 Mon Sep 17 00:00:00 2001 From: whitequark Date: Wed, 14 Oct 2015 16:01:36 +0300 Subject: [PATCH 6/6] conda: llvmlite-artiq: test by importing binding. --- conda/llvmlite-artiq/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/llvmlite-artiq/meta.yaml b/conda/llvmlite-artiq/meta.yaml index 8da703559..45c964b0f 100644 --- a/conda/llvmlite-artiq/meta.yaml +++ b/conda/llvmlite-artiq/meta.yaml @@ -20,7 +20,7 @@ build: test: imports: - llvmlite_artiq - - llvmlite_artiq.llvmpy + - llvmlite_artiq.binding about: home: https://pypi.python.org/pypi/llvmlite/