From 72c91f629e9b20375796ce86a4457c991d07db37 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 18 Jun 2013 09:20:37 +0200
Subject: [PATCH] llvm: added libllvm pkg; move libs to standard dirs; clang
 needs gcc.

---
 common/shlibs         |  2 +-
 srcpkgs/libllvm       |  1 +
 srcpkgs/llvm/INSTALL  |  5 -----
 srcpkgs/llvm/REMOVE   |  5 -----
 srcpkgs/llvm/template | 32 +++++++++++++++-----------------
 5 files changed, 17 insertions(+), 28 deletions(-)
 create mode 120000 srcpkgs/libllvm
 delete mode 100644 srcpkgs/llvm/INSTALL
 delete mode 100644 srcpkgs/llvm/REMOVE

diff --git a/common/shlibs b/common/shlibs
index a262d1aef60..a86639dc4e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -914,7 +914,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 llvm-3.3_1
+libLLVM-3.3.so libllvm-3.3_4
 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/libllvm b/srcpkgs/libllvm
new file mode 120000
index 00000000000..0d68131b9b3
--- /dev/null
+++ b/srcpkgs/libllvm
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm/INSTALL b/srcpkgs/llvm/INSTALL
deleted file mode 100644
index eb174407722..00000000000
--- a/srcpkgs/llvm/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-post)
-	ldconfig -r .
-	;;
-esac
diff --git a/srcpkgs/llvm/REMOVE b/srcpkgs/llvm/REMOVE
deleted file mode 100644
index eb174407722..00000000000
--- a/srcpkgs/llvm/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-post)
-	ldconfig -r .
-	;;
-esac
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index f5097621a14..1d9fc89fa86 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -2,13 +2,12 @@
 pkgname=llvm
 version=3.3
 wrksrc="llvm-${version}.src"
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-expensive-checks --disable-debug-runtime
  --enable-targets=all --enable-bindings=none --enable-optimize
  --enable-shared --enable-libffi --enable-llvmc-dynamic
- --disable-assertions --libdir=/usr/lib/llvm
- --enable-experimental-targets=R600"
+ --disable-assertions --enable-experimental-targets=R600"
 short_desc="Low Level Virtual Machine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.llvm.org"
@@ -41,25 +40,16 @@ post_extract() {
 pre_configure() {
 	# Fix installation directories, ./configure doesn't seem to set them right
 	sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
-		-e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \
 		-e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
 		Makefile.config.in
-	sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib/llvm:' \
-		tools/llvm-config/llvm-config.cpp
-	sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib/llvm":' \
-		autoconf/configure.ac configure
 }
 
 post_install() {
 	# Fix permissions of static libs
-	chmod -x ${DESTDIR}/usr/lib/llvm/*.a
+	chmod -x ${DESTDIR}/usr/lib/*.a
  
 	# Get rid of example Hello transformation
-	rm ${DESTDIR}/usr/lib/llvm/*LLVMHello.*
-
-	# Add ld.so.conf.d entry
-	vmkdir etc/ld.so.conf.d
-	echo /usr/lib/llvm > ${DESTDIR}/etc/ld.so.conf.d/llvm.conf
+	rm ${DESTDIR}/usr/lib/*LLVMHello.*
 
 	# Required for multilib.
 	if [ "$XBPS_MACHINE" = "x86_64" ]; then
@@ -74,7 +64,7 @@ post_install() {
 clang-analyzer_package() {
 	noarch=yes
 	pycompile_dirs="usr/lib/clang-analyzer"
-	depends="clang>=${version} python"
+	depends="clang-${version}_${revision} python"
 	short_desc="Low-Level Virtual Machine (LLVM) - A source code analysis framework"
 	homepage="http://clang-analyzer.llvm.org/"
 	pkg_install() {
@@ -92,7 +82,7 @@ clang-analyzer_package() {
 }
 
 clang_package() {
-	depends="libstdc++-devel binutils"
+	depends="libstdc++-devel binutils gcc"
 	short_desc="Low-Level Virtual Machine (LLVM) -- C language family frontend"
 	homepage="http://clang.llvm.org/"
 	pkg_install() {
@@ -100,7 +90,7 @@ clang_package() {
 		vmove "usr/bin/*clang*"
 		vmove usr/bin/c-index-test
 		vmove usr/lib/clang
-		vmove "usr/lib/llvm/libclang*"
+		vmove "usr/lib/libclang*"
 		vmove "usr/share/man/man1/*clang*"
 	}
 }
@@ -113,6 +103,14 @@ llvm-docs_package() {
 	}
 }
 
+libllvm_package() {
+	short_desc+=" - runtime library"
+	replaces="llvm>3.2<3.3_4"
+	pkg_install() {
+		vmove usr/lib/libLLVM-${version}.so
+	}
+}
+
 llvm_package() {
 	pkg_install() {
 		vmove all