From addedf7901879d9a3ac09cd8f36d04807799a221 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 14 May 2014 10:33:07 +0200 Subject: [PATCH] llvm: update to 3.4.1 (soname bump). --- common/shlibs | 3 +-- srcpkgs/llvm/template | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index f02ae44bd87..47a5902eb74 100644 --- a/common/shlibs +++ b/common/shlibs @@ -919,8 +919,7 @@ libyaml-0.so.2 libyaml-0.1.4_1 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1 libyajl.so.2 yajl-2.0.1_1 libconfuse.so.0 confuse-2.7_1 -libLLVM-3.3.so libllvm-3.3_4 -libLLVM-3.4.so libllvm-3.4_1 +libLLVM-3.4.1.so libllvm-3.4.1_1 libisofs.so.6 libisofs-0.6.24_1 libbfd-2.22.so binutils-2.22_1<2.23_1 libopcodes-2.22.so binutils-2.22_1<2.23_1 diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index b76d36beb6c..efd38da99b9 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -1,8 +1,8 @@ # Template file for 'llvm' pkgname=llvm -version=3.4 -wrksrc="llvm-${version}" -revision=3 +version=3.4.1 +wrksrc="llvm-${version}.src" +revision=1 lib32disabled=yes configure_args="--disable-expensive-checks --disable-debug-runtime --enable-bindings=none --enable-optimize --enable-shared --enable-libffi @@ -13,11 +13,11 @@ homepage="http://www.llvm.org" license="BSD" distfiles=" http://www.llvm.org/releases/${version}/llvm-${version}.src.tar.gz - http://www.llvm.org/releases/${version}/clang-${version}.src.tar.gz - http://www.llvm.org/releases/${version}/compiler-rt-${version}.src.tar.gz" + http://www.llvm.org/releases/${version}/cfe-${version}.src.tar.gz + http://www.llvm.org/releases/${version%.*}/compiler-rt-${version%.*}.src.tar.gz" checksum=" - 25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628 - 22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b + 7d28bb6eca243a2bb6d65a05743ab915b57958a7770277364e93534b63eef93a + ab83f30951b34d75729026e0e73c180a728a140f2a02cbb8915805051a9d6bb7 f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c" # XXX Investigate ocaml bindings. @@ -26,12 +26,12 @@ makedepends="zlib-devel libffi-devel" post_extract() { # Move clang files into the llvm source. - if [ -d ${XBPS_BUILDDIR}/clang-${version} ]; then - mv ${XBPS_BUILDDIR}/clang-${version} ${wrksrc}/tools/clang + if [ -d ${XBPS_BUILDDIR}/cfe-${version}.src ]; then + mv ${XBPS_BUILDDIR}/cfe-${version}.src ${wrksrc}/tools/clang fi # Move compiler-rt files into the llvm source. - if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version} ]; then - mv ${XBPS_BUILDDIR}/compiler-rt-${version} ${wrksrc}/projects/compiler-rt + if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version%.*} ]; then + mv ${XBPS_BUILDDIR}/compiler-rt-${version%.*} ${wrksrc}/projects/compiler-rt fi }