diff --git a/conda/llvmlite-or1k/bld.bat b/conda/llvmlite-or1k/bld.bat index 5e67a1e4a..78ab6ac38 100644 --- a/conda/llvmlite-or1k/bld.bat +++ b/conda/llvmlite-or1k/bld.bat @@ -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 diff --git a/conda/llvmlite-or1k/build.sh b/conda/llvmlite-or1k/build.sh index 067b7ce71..f2734bba4 100755 --- a/conda/llvmlite-or1k/build.sh +++ b/conda/llvmlite-or1k/build.sh @@ -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 diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 4e052c38c..615ebdc68 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -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:: diff --git a/patches/llvmlite/0001-add-all-targets.patch b/misc/llvmlite-add-all-targets.patch similarity index 100% rename from patches/llvmlite/0001-add-all-targets.patch rename to misc/llvmlite-add-all-targets.patch