Skip to content

Commit

Permalink
move patches into misc
Browse files Browse the repository at this point in the history
sbourdeauducq committed Apr 2, 2015
1 parent f124350 commit 6973c0f
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion conda/llvmlite-or1k/bld.bat
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ set CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%
if exist ffi\build rmdir /S /Q ffi\build

@rem Apply patches
patch -p1 < %RECIPE_DIR%/../../patches/llvmlite/0001-add-all-targets.patch
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-add-all-targets.patch

%PYTHON% -S setup.py install
if errorlevel 1 exit 1
2 changes: 1 addition & 1 deletion conda/llvmlite-or1k/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

patch -p1 < ${RECIPE_DIR}/../../patches/llvmlite/0001-add-all-targets.patch
patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-add-all-targets.patch
PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install
2 changes: 1 addition & 1 deletion doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@ Installing the host-side software
$ cd ~/artiq-dev
$ git clone https://github.com/numba/llvmlite
$ cd ~/artiq-dev/llvmlite
$ cat ~/artiq-dev/artiq/patches/llvmlite/* | patch -p1
$ patch -p1 < ~/artiq-dev/artiq/misc/llvmlite-add-all-targets.patch
$ PATH=/usr/local/llvm-or1k/bin:$PATH sudo -E python3 setup.py install

.. note::
File renamed without changes.

0 comments on commit 6973c0f

Please sign in to comment.