Merge branch '3.0' into 3.1

Conflicts:
	llvm/.footprint
	llvm/Pkgfile
This commit is contained in:
Thomas Penteker 2014-05-13 16:09:11 +02:00
commit 17db130092
2 changed files with 26 additions and 34 deletions

View File

@ -628,7 +628,7 @@ drwxr-xr-x root/root usr/include/llvm/Transforms/Utils/
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/BugpointPasses.so
-rwxr-xr-x root/root usr/lib/libLLVM-3.4.1.so
lrwxrwxrwx root/root usr/lib/libLLVM-3.4.so -> /tmp/llvm-work/pkg/usr/lib/libLLVM-3.4.1.so
lrwxrwxrwx root/root usr/lib/libLLVM-3.4.so -> libLLVM-3.4.1.so
-rwxr-xr-x root/root usr/lib/libLLVMAnalysis.a
-rwxr-xr-x root/root usr/lib/libLLVMAsmParser.a
-rwxr-xr-x root/root usr/lib/libLLVMAsmPrinter.a
@ -675,17 +675,3 @@ lrwxrwxrwx root/root usr/lib/libLLVM-3.4.so -> /tmp/llvm-work/pkg/usr/lib/libLLV
-rwxr-xr-x root/root usr/lib/libLLVMipo.a
-rwxr-xr-x root/root usr/lib/libLTO.a
-rwxr-xr-x root/root usr/lib/libLTO.so
-rwxr-xr-x root/root usr/lib/libllvm.a
-rwxr-xr-x root/root usr/lib/libllvm_R600.a
-rwxr-xr-x root/root usr/lib/libllvm_X86.a
-rwxr-xr-x root/root usr/lib/libllvm_analysis.a
-rwxr-xr-x root/root usr/lib/libllvm_bitreader.a
-rwxr-xr-x root/root usr/lib/libllvm_bitwriter.a
-rwxr-xr-x root/root usr/lib/libllvm_executionengine.a
-rwxr-xr-x root/root usr/lib/libllvm_ipo.a
-rwxr-xr-x root/root usr/lib/libllvm_irreader.a
-rwxr-xr-x root/root usr/lib/libllvm_linker.a
-rwxr-xr-x root/root usr/lib/libllvm_passmgr_builder.a
-rwxr-xr-x root/root usr/lib/libllvm_scalar_opts.a
-rwxr-xr-x root/root usr/lib/libllvm_target.a
-rwxr-xr-x root/root usr/lib/libllvm_vectorize.a

View File

@ -8,33 +8,39 @@ name=llvm
version=3.4.1
release=1
source=(http://llvm.org/releases/$version/{$name,cfe}-$version.src.tar.gz \
config.h llvm-config.h)
config.h llvm-config.h)
build() {
mv cfe-$version.src $name-$version.src/tools/clang
mv cfe-$version.src $name-$version.src/tools/clang
cd $name-$version.src
cd $name-$version.src
rm -rf tools/clang
rm -rf tools/clang
# enable enable-shard and the R600 target for mesa3d
./configure --prefix=/usr --without-oprofile --enable-cxx11 \
--enable-targets=x86,x86_64 \
--enable-shared --enable-experimental-targets=R600 \
./configure --prefix=/usr \
--without-oprofile \
--enable-cxx11 \
--enable-targets=x86,x86_64,r600 \
--enable-shared \
--mandir=/usr/man
make $MAKEFLAGS
make DESTDIR=$PKG install
make $MAKEFLAGS
make DESTDIR=$PKG install
find $PKG -name .dir -delete
rm -rf $PKG/usr/docs
find $PKG -name .dir -delete
rm -rf $PKG/usr/docs
# multilib stubs
mv $PKG/usr/include/llvm/Config/config{,-64}.h
mv $PKG/usr/include/llvm/Config/llvm-config{,-64}.h
install -m 0644 $SRC/config.h $PKG/usr/include/llvm/Config/
install -m 0644 $SRC/llvm-config.h $PKG/usr/include/llvm/Config/
# multilib stubs
mv $PKG/usr/include/llvm/Config/config{,-64}.h
mv $PKG/usr/include/llvm/Config/llvm-config{,-64}.h
install -m 0644 $SRC/config.h $PKG/usr/include/llvm/Config/
install -m 0644 $SRC/llvm-config.h $PKG/usr/include/llvm/Config/
# remove example hello transform
rm $PKG/usr/lib/LLVMHello.so
# fix symlink b0rkage
cd $PKG/usr/lib
ln -sf libLLVM-${version}.so libLLVM-${version%.*}.so
# remove example hello transform
rm $PKG/usr/lib/LLVMHello.so
}