occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

move patches into misc

This commit is contained in:
Sebastien Bourdeauducq 2015-04-02 17:06:19 +08:00
parent f124350555
commit 6973c0f8d5
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conda/llvmlite-or1k/bld.bat
View File

@ -5,7 +5,7 @@ set CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%
if exist ffi\build rmdir /S /Q ffi\build if exist ffi\build rmdir /S /Q ffi\build
@rem Apply patches @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 %PYTHON% -S setup.py install
if errorlevel 1 exit 1 if errorlevel 1 exit 1

2
conda/llvmlite-or1k/build.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/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 PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install

2
doc/manual/installing.rst
View File

@ -142,7 +142,7 @@ Installing the host-side software
$ cd ~/artiq-dev $ cd ~/artiq-dev
$ git clone https://github.com/numba/llvmlite $ git clone https://github.com/numba/llvmlite
$ cd ~/artiq-dev/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 $ PATH=/usr/local/llvm-or1k/bin:$PATH sudo -E python3 setup.py install
.. note:: .. note::

0
patches/llvmlite/0001-add-all-targets.patch → misc/llvmlite-add-all-targets.patch
View File