From 7389d1a368add8b8d1ebcb51a1de06f123ae5f9f Mon Sep 17 00:00:00 2001 From: Philippe PITTOLI Date: Fri, 18 Oct 2019 13:25:18 +0200 Subject: [PATCH] crystal (still) using llvm-6 --- crystal/recipe.spec | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/crystal/recipe.spec b/crystal/recipe.spec index 1ae00a0..2a11a22 100644 --- a/crystal/recipe.spec +++ b/crystal/recipe.spec @@ -1,13 +1,17 @@ name: crystal -version: 0.30.1 +version: 0.31.1 release: 1 sources: https://github.com/crystal-lang/crystal/archive/%{version}.tar.gz -> %{name}-%{version}.tar.gz +build-dependencies: + - llvm-6-dev + dependencies: - libyaml - libevent - pcre - - openssl + - llvm-6 + - libressl @build cd %{name}-%{version} @@ -15,7 +19,7 @@ dependencies: FLAGS="--release --no-debug" \ CRYSTAL_PATH="$(pwd)/src" \ CRYSTAL_CONFIG_VERSION="%{version}" \ - CRYSTAL_CONFIG_PATH="lib:/usr/lib/crystal" \ + CRYSTAL_CONFIG_PATH="lib:%{prefix}/lib/crystal" \ CRYSTAL_CACHE_DIR="/tmp/crystal" \ LLVM_CONFIG=/usr/bad/llvm-6/bin/llvm-config make docs CRYSTAL_CACHE_DIR="/tmp/crystal" @@ -24,25 +28,25 @@ dependencies: cd %{name}-%{version} mkdir -p \ - "%{pkg}/usr/bin" \ - "%{pkg}/usr/lib" \ - "%{pkg}/usr/share/man/man1" + "%{pkg}%{prefix}/bin" \ + "%{pkg}%{prefix}/lib" \ + "%{pkg}%{prefix}/share/man/man1" - install -m755 ".build/crystal" "%{pkg}/usr/bin/crystal" + install -m755 ".build/crystal" "%{pkg}%{prefix}/bin/crystal" - cp -r src "%{pkg}/usr/lib/crystal" + cp -r src "%{pkg}%{prefix}/lib/crystal" ( - cd "%{pkg}/usr/lib/crystal" + cd "%{pkg}%{prefix}/lib/crystal" rm -rf ext/sigfault.* llvm/ext/llvm_ext.o ) - mkdir -p "%{pkg}/usr/share/doc/crystal" - cp -r docs "%{pkg}/usr/share/doc/crystal/api" - cp -r samples "%{pkg}/usr/share/doc/crystal/" + mkdir -p "%{pkg}%{prefix}/share/doc/crystal" + cp -r docs "%{pkg}%{prefix}/share/doc/crystal/api" + cp -r samples "%{pkg}%{prefix}/share/doc/crystal/" - install -m644 man/crystal.1 "%{pkg}/usr/share/man/man1/" + install -m644 man/crystal.1 "%{pkg}%{prefix}/share/man/man1/" # We’ll probably want those at some point… in due time, and in splits. - #install -m644 etc/completion.bash "%{pkg}/usr/share/bash-completion/completions/crystal" - #install -m644 etc/completion.zsh "%{pkg}/usr/share/zsh/site-functions/_crystal" + #install -m644 etc/completion.bash "%{pkg}%{prefix}/share/bash-completion/completions/crystal" + #install -m644 etc/completion.zsh "%{pkg}%{prefix}/share/zsh/site-functions/_crystal"