From 77ca2681da52159b0afa9834d6bf618d76d15a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 2 Mar 2015 13:51:15 -0700 Subject: [PATCH 1/8] Update LLVM to 3.5.1 Do not build shared libraries, because: a) it fails to build with an error: [llvm] [ 8%] Built target llvm-tblgen [llvm] Scanning dependencies of target intrinsics_gen [llvm] [ 8%] Building Intrinsics.gen... [llvm] ../../../bin/llvm-tblgen: error while loading shared libraries: libLLVMSupport.so: cannot open shared object file: No such file or directory b) it is not recommended by upstream, i.e. from docs/CMake.rst: **BUILD_SHARED_LIBS**:BOOL Flag indicating if shared libraries will be built. Its default value is OFF. Shared libraries are not supported on Windows and not recommended on the other OSes. --- pkgs/llvm.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/llvm.yaml b/pkgs/llvm.yaml index 9b2f2e6b9..b5ca03680 100644 --- a/pkgs/llvm.yaml +++ b/pkgs/llvm.yaml @@ -1,12 +1,8 @@ extends: [cmake_package] sources: -- url: http://llvm.org/releases/3.4/llvm-3.4.src.tar.gz - key: tar.gz:ewswclljfreeqg43hf7cwvpuq4hei6lg +- key: tar.xz:x4zhluwxreablsgy6xtpj6ec7dhtx5iz + url: http://llvm.org/releases/3.5.1/llvm-3.5.1.src.tar.xz defaults: relocatable: false - -build_stages: -- name: configure - extra: ['-D BUILD_SHARED_LIBS:BOOL=ON'] From 8dad23497b5f7de1ed5d6b12b0e90988d285db1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 2 Mar 2015 14:42:56 -0700 Subject: [PATCH 2/8] Add llvmlite We also needed to put `llvm-config` into path during building. --- pkgs/llvm.yaml | 4 ++++ pkgs/llvmlite.yaml | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/llvmlite.yaml diff --git a/pkgs/llvm.yaml b/pkgs/llvm.yaml index b5ca03680..ffd23d47a 100644 --- a/pkgs/llvm.yaml +++ b/pkgs/llvm.yaml @@ -6,3 +6,7 @@ sources: defaults: relocatable: false + +when_build_dependency: +- prepend_path: PATH + value: '${ARTIFACT}/bin' diff --git a/pkgs/llvmlite.yaml b/pkgs/llvmlite.yaml new file mode 100644 index 000000000..c7ce8a7e7 --- /dev/null +++ b/pkgs/llvmlite.yaml @@ -0,0 +1,8 @@ +extends: [distutils_package] +dependencies: + build: [llvm] + run: [] + +sources: + - key: git:317245a28a26056cb2eef48831329ed8eb76491e + url: https://github.com/numba/llvmlite From 6f7db6badfd29007dc48a5a16321766832b7d2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 2 Mar 2015 14:47:28 -0700 Subject: [PATCH 3/8] Add numba --- pkgs/numba.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 pkgs/numba.yaml diff --git a/pkgs/numba.yaml b/pkgs/numba.yaml new file mode 100644 index 000000000..e673cc039 --- /dev/null +++ b/pkgs/numba.yaml @@ -0,0 +1,8 @@ +extends: [distutils_package] +dependencies: + build: [llvmlite, numpy] + run: [] + +sources: + - key: git:772e4c0ad4bb07b329d65f6b9c40f097149431cd + url: https://github.com/numba/numba From 9b44a7ccf8aea6380795f185ebef0d138e1079d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 2 Mar 2015 14:58:10 -0700 Subject: [PATCH 4/8] Add enum34 package --- pkgs/enum34.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 pkgs/enum34.yaml diff --git a/pkgs/enum34.yaml b/pkgs/enum34.yaml new file mode 100644 index 000000000..2eb1c1701 --- /dev/null +++ b/pkgs/enum34.yaml @@ -0,0 +1,14 @@ +extends: [distutils_package] + +dependencies: + build: [] + run: [] + +sources: +# The proper sources should be: +#- key: tar.gz:2paz6jvgundctqmmo5pvtx6f3vmvozgh +# url: https://pypi.python.org/packages/source/e/enum34/enum34-1.0.4.tar.gz +# But they don't work due to https://github.com/hashdist/hashdist/issues/310, +# so we use this equivalent git repository: +- key: git:dc35e72a5b4c6da1f0caaab1aaa13553e481e173 + url: https://github.com/certik/enum34 From eb1a250ddf82ed7ecdf11f8d8999bd27a529cc1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 2 Mar 2015 15:01:14 -0700 Subject: [PATCH 5/8] Add funcsigs --- pkgs/funcsigs.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 pkgs/funcsigs.yaml diff --git a/pkgs/funcsigs.yaml b/pkgs/funcsigs.yaml new file mode 100644 index 000000000..eea1a6f9b --- /dev/null +++ b/pkgs/funcsigs.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: +- key: tar.gz:3a6onxylb2tgdbya7yo3gu2smoi2ri5n + url: https://pypi.python.org/packages/source/f/funcsigs/funcsigs-0.4.tar.gz From 34d7d5e7dd853f53fe2301f9031b38303bf7a2e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 2 Mar 2015 15:01:23 -0700 Subject: [PATCH 6/8] Add missing dependencies to llvmlite and numba --- pkgs/llvmlite.yaml | 2 +- pkgs/numba.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/llvmlite.yaml b/pkgs/llvmlite.yaml index c7ce8a7e7..361ab2c2c 100644 --- a/pkgs/llvmlite.yaml +++ b/pkgs/llvmlite.yaml @@ -1,7 +1,7 @@ extends: [distutils_package] dependencies: build: [llvm] - run: [] + run: [enum34] sources: - key: git:317245a28a26056cb2eef48831329ed8eb76491e diff --git a/pkgs/numba.yaml b/pkgs/numba.yaml index e673cc039..617c24cf6 100644 --- a/pkgs/numba.yaml +++ b/pkgs/numba.yaml @@ -1,7 +1,7 @@ extends: [distutils_package] dependencies: build: [llvmlite, numpy] - run: [] + run: [numpy, argparse, funcsigs] sources: - key: git:772e4c0ad4bb07b329d65f6b9c40f097149431cd From ff7f09e213a79d8f6c7586d7553b7fb6fca229be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 2 Mar 2015 15:03:56 -0700 Subject: [PATCH 7/8] Use the latest development version of numba --- pkgs/numba.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/numba.yaml b/pkgs/numba.yaml index 617c24cf6..9d970cb70 100644 --- a/pkgs/numba.yaml +++ b/pkgs/numba.yaml @@ -4,5 +4,5 @@ dependencies: run: [numpy, argparse, funcsigs] sources: - - key: git:772e4c0ad4bb07b329d65f6b9c40f097149431cd + - key: git:8267aed50bf0505de0689ae3cc45faa01353e4cc url: https://github.com/numba/numba From 85751ac4d25aa8cf0abf8b14dde168de46141b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 2 Mar 2015 16:29:59 -0700 Subject: [PATCH 8/8] Update Clang to 3.5.1 So that it matches the LLVM version we have in Hashstack. --- pkgs/clang.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/clang.yaml b/pkgs/clang.yaml index 2ece259a8..a0f773d88 100644 --- a/pkgs/clang.yaml +++ b/pkgs/clang.yaml @@ -3,10 +3,9 @@ extends: [cmake_package] dependencies: build: [llvm] - sources: -- url: http://llvm.org/releases/3.4/clang-3.4.src.tar.gz - key: tar.gz:ekuxqdntxbnh6lvz5ipx63qa3ibety6r +- key: tar.xz:m5z7h6opqflddtd6o6pmcng52iunzdu2 + url: http://llvm.org/releases/3.5.1/cfe-3.5.1.src.tar.xz defaults: # lib/libclang.so.3.4 contains hard-coded path