diff --git a/srcpkgs/libclang b/srcpkgs/libclang new file mode 120000 index 0000000000..0d68131b9b --- /dev/null +++ b/srcpkgs/libclang @@ -0,0 +1 @@ +llvm \ No newline at end of file diff --git a/srcpkgs/libllvm b/srcpkgs/libllvm new file mode 120000 index 0000000000..0d68131b9b --- /dev/null +++ b/srcpkgs/libllvm @@ -0,0 +1 @@ +llvm \ No newline at end of file diff --git a/srcpkgs/llvm-devel b/srcpkgs/llvm-devel new file mode 120000 index 0000000000..0d68131b9b --- /dev/null +++ b/srcpkgs/llvm-devel @@ -0,0 +1 @@ +llvm \ No newline at end of file diff --git a/srcpkgs/llvm/clang-devel.template b/srcpkgs/llvm/clang-devel.template index a7715c8315..8ef99fabb1 100644 --- a/srcpkgs/llvm/clang-devel.template +++ b/srcpkgs/llvm/clang-devel.template @@ -28,10 +28,11 @@ long_desc=" This package includes development files for the LLVM clang." -noarch=yes +Add_dependency run clang do_install() { - mkdir -p ${DESTDIR}/usr/include + install -d ${DESTDIR}/usr/{include,lib} mv ${SRCPKGDESTDIR}/usr/include/clang* ${DESTDIR}/usr/include + mv ${SRCPKGDESTDIR}/usr/lib/libclang*.a ${DESTDIR}/usr/lib } diff --git a/srcpkgs/llvm/clang.template b/srcpkgs/llvm/clang.template index bd1a80f9c7..934fc66770 100644 --- a/srcpkgs/llvm/clang.template +++ b/srcpkgs/llvm/clang.template @@ -30,12 +30,13 @@ Add_dependency run libgcc Add_dependency run glibc Add_dependency run libffi Add_dependency run libstdc++ +Add_dependency run libllvm Add_dependency run llvm do_install() { mkdir -p ${DESTDIR}/usr/{bin,lib} ${DESTDIR}/usr/share/man/man1 - mv ${SRCPKGDESTDIR}/usr/bin/*clang ${DESTDIR}/usr/bin + mv ${SRCPKGDESTDIR}/usr/bin/*clang* ${DESTDIR}/usr/bin mv ${SRCPKGDESTDIR}/usr/lib/clang ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/man/man1/*clang* \ ${DESTDIR}/usr/share/man/man1 diff --git a/srcpkgs/llvm/depends b/srcpkgs/llvm/depends index f9c802c81c..623f4446e0 100644 --- a/srcpkgs/llvm/depends +++ b/srcpkgs/llvm/depends @@ -1,2 +1,3 @@ -abi_depends=">=2.7" +# Only accept the same ABI version. +abi_depends="==2.8" api_depends="${abi_depends}" diff --git a/srcpkgs/llvm/libclang.template b/srcpkgs/llvm/libclang.template new file mode 100644 index 0000000000..ad045e926f --- /dev/null +++ b/srcpkgs/llvm/libclang.template @@ -0,0 +1,41 @@ +# Template file for 'libclang'. +# +short_desc="Low-Level Virtual Machine (LLVM), C language family frontend library" +long_desc=" + Clang project is a new C, C++, Objective C and Objective C++ front-end for + the LLVM compiler. Some of its goals include the following: + + End-User Features: + + * Fast compiles and low memory use + * Expressive diagnostics (examples) + * GCC compatibility + + Utility and Applications: + + * Modular library based architecture + * Support diverse clients (refactoring, static analysis, code + generation, etc) + * Allow tight integration with IDEs + * Use the LLVM 'BSD' License + + Internal Design and Implementation: + + * A real-world, production quality compiler + * A simple and hackable code base + * A single unified parser for C, Objective C, C++, and Objective C++ + * Conformance with C/C++/ObjC and their variants + + This package includes the shared library used by the Clang frontend." + +Add_dependency run libgcc +Add_dependency run glibc +Add_dependency run libffi +Add_dependency run libstdc++ +Add_dependency run libllvm + +do_install() +{ + install -d ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libclang.so* ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/llvm/libllvm.template b/srcpkgs/llvm/libllvm.template new file mode 100644 index 0000000000..e0cb0ff8e1 --- /dev/null +++ b/srcpkgs/llvm/libllvm.template @@ -0,0 +1,18 @@ +# Template file for 'libllvm'. +# +short_desc="Low-Level Virtual Machine (LLVM) - shared libraries" +long_desc=" + ${long_desc} + + This package includes the shared libraries used by the LLVM projects." + +Add_dependency run libgcc +Add_dependency run glibc +Add_dependency run libffi +Add_dependency run libstdc++ + +do_install() +{ + install -d ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/llvm/llvm-devel.template b/srcpkgs/llvm/llvm-devel.template new file mode 100644 index 0000000000..d56232ab3d --- /dev/null +++ b/srcpkgs/llvm/llvm-devel.template @@ -0,0 +1,17 @@ +# Template file for 'llvm-devel'. +# +short_desc="Low Level Virtual Machine - development files" +long_desc=" + ${long_desc} + + This package includes development files for the LLVM clang." + +Add_dependency run libffi-devel +Add_dependency run libllvm +Add_dependency run llvm + +do_install() +{ + install -d ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/{include,lib} ${DESTDIR}/usr +} diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index 08abecee49..478d1df169 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -1,6 +1,6 @@ # Template file for 'llvm' pkgname=llvm -version=2.7 +version=2.8 distfiles=" http://www.llvm.org/releases/${version}/llvm-${version}.tgz http://www.llvm.org/releases/${version}/clang-${version}.tgz" @@ -12,8 +12,8 @@ PATH='/bin:/usr/bin:$PATH'" short_desc="Low Level Virtual Machine" maintainer="Juan RP " checksum=" -99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5 -fb349471947f155c1cda1c8a4a3bbc7fa437b86f6875d9978f86c915dfed623a" +25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b +ed83481553e6a39a8a2953e89630d881d87833506f096a90f18d93ec2bdee0c1" long_desc=" Low Level Virtual Machine (LLVM) is: @@ -47,13 +47,15 @@ long_desc=" optional LLVM components can be used to build high-level virtual machines and other systems that need these services." -subpackages="clang clang-devel llvm-docs" +subpackages="libclang clang clang-devel libllvm llvm-devel llvm-docs" # XXX: Investigate bindings support. Add_dependency run libgcc Add_dependency run glibc Add_dependency run libstdc++ Add_dependency run libffi +Add_dependency run libclang +Add_dependency run libllvm Add_dependency build python Add_dependency build libffi-devel diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index 6865bf3e50..65e77bcba3 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -629,12 +629,13 @@ libldap-2.4.so libldap libldap-devel libldap_r-2.4.so libldap libldap-devel libevent-1.4.so libevent libevent-devel libSDL_mixer-1.2.so SDL_mixer SDL_mixer-devel -libCIndex.so llvm llvm-devel -libEnhancedDisassembly.so llvm llvm-devel -libLLVM-2.7.so llvm llvm-devel -libLLVMHello.so llvm llvm-devel -libLTO.so llvm llvm-devel -libprofile_rt.so llvm llvm-devel +libEnhancedDisassembly.so libllvm +libLLVM-2.8.so libllvm +libLLVMHello.so libllvm +libLTO.so libllvm +libprofile_rt.so libllvm +libBugpointPasses.so libllvm +libclang.so libclang libapr-1.so apr apr-devel libaprutil-1.so apr-util apr-util-devel libnetpgp.so libnetpgp libnetpgp-devel