llvm 3.1-1 màj port

1 files changed, 23 insertions, 5 deletions

diff --git a/llvm/Pkgfile b/llvm/Pkgfile
index 591d19fc2..9ca631593 100644
--- a/llvm/Pkgfile
+++ b/llvm/Pkgfile
@@ -6,13 +6,33 @@
 # Run on:
 
 name=llvm
-version=3.0
+version=3.1
 release=1
-source=(http://llvm.org/releases/$version/{$name,clang}-$version.tar.gz)
+source=(http://llvm.org/releases/$version/{llvm,clang,compiler-rt}-$version.src.tar.gz
+	fix-libprofile_rt.a-location.patch)
 
 build() {
 	cd $name-$version.src
-	mv ../clang-$version.src ./tools/clang
+	rm -rf tools/clang projects/compiler-rt
+	mv ../clang-$version.src tools/clang
+	mv ../compiler-rt-$version.src projects/compiler-rt
+
+	patch -p1 -d tools/clang < ../fix-libprofile_rt.a-location.patch
+
+	for i in `grep -r -l "/usr/bin/env python"`; do sed "s|/usr/bin/env python|/usr/bin/env python2|g" -i $i; done
+	for i in `grep -r -l "/usr/bin/python"`; do sed "s|/usr/bin/python|/usr/bin/python2|g" -i $i; done
+	sed "s|python|python2|g" -i Makefile.rules
+
+	sed -i 's|\$(PROJ_libdir)|/usr/lib/llvm|' bindings/ocaml/Makefile.ocaml
+	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
+
+	sed -i 's:$(RPATH) -Wl,$(\(Tooldir\|LibDir\|ExmplDir\))::g' Makefile.rules
 
 	case `uname -m` in
 		x86_64)
@@ -37,8 +57,6 @@ build() {
 	make
 	make DESTDIR=$PKG KEEP_SYMBOLS=1 PROJ_docsdir=/usr/share/$name PROJ_etcdir=/etc/$name PROJ_libdir=/usr/lib/$name install
 
-	sed -i -e "s|ABS_RUN_DIR/lib.*\"|ABS_RUN_DIR/lib/$name\"|" $PKG/usr/bin/llvm-config
-
 	install -d $PKG/etc/ld.so.conf.d
 	echo /usr/lib/llvm > $PKG/etc/ld.so.conf.d/llvm.conf
 }