Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=77df660265ccd19e64033d58b66f66549a4eb4eb

commit 77df660265ccd19e64033d58b66f66549a4eb4eb
Author: DeX77 <[email protected]>
Date:   Tue Aug 22 21:56:19 2017 +0200

llvm-4.0.1-2-x86_64

+ add libc++ and lib32-libc++

diff --git a/source/devel/llvm/FrugalBuild b/source/devel/llvm/FrugalBuild
index 654c425..a12dada 100644
--- a/source/devel/llvm/FrugalBuild
+++ b/source/devel/llvm/FrugalBuild
@@ -5,7 +5,7 @@

pkgname=llvm
pkgver=4.0.1
-pkgrel=1
+pkgrel=2
gcc_ver=6.3.1-4
url="http://www.llvm.org";
pkgdesc="Low Level Virtual Machine (Compiler , Tools and Libs)"
@@ -30,10 +30,12 @@ if Fuse DEVEL; then
Finclude scm
else
source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.xz \
-               http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz)
+               http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz \
+               http://llvm.org/releases/$pkgver/libcxx-$pkgver.src.tar.xz \
+               http://llvm.org/releases/$pkgver/libcxxabi-$pkgver.src.tar.xz )
up2date="Flastarchive $url/releases/download.html .src.tar.xz"
_F_archive_ver="${pkgver}.src"
-       signatures=("${source[0]}.sig" "${source[1]}.sig" )
+       signatures=("${source[0]}.sig" "${source[1]}.sig" "${source[2]}.sig" 
"${source[3]}.sig")
fi

_F_cross32_delete=('usr/docs' 'usr/share' \
@@ -68,6 +70,20 @@ subrodepends+=("")
subgroups+=('lib')
subarchs+=("x86_64")

+subpkgs+=("libc++")
+subdescs+=("A new implementation of the C++ standard library")
+subdepends+=("libgcc")
+subrodepends+=("")
+subgroups+=('lib-extra')
+subarchs+=("x86_64")
+
+subpkgs+=("lib32-libc++")
+subdescs+=("A new implementation of the C++ standard library")
+subdepends+=("libgcc")
+subrodepends+=("")
+subgroups+=('lib-extra')
+subarchs+=("x86_64")
+
subpkgs+=("lib32-${pkgname}-libs")
subdescs+=("LLVM shared libs (32-bit)")
subdepends+=("lib32-ncurses>=6.0-12 lib32-libedit>=20160903_3.1")
@@ -96,7 +112,9 @@ _common_cmake_confopts="     -DCMAKE_INSTALL_PREFIX=/usr \
-DLLVM_HOST_TRIPLE=${CARCH}-frugalware-linux \
-DLLVM_DEFAULT_TARGET_TRIPLE=${CARCH}-frugalware-linux \
-DC_INCLUDE_DIRS=/usr/local/include:/usr/$CHOST/include:/usr/include/c++/${gcc_ver}:/usr/include/c++/${gcc_ver}/backward:/usr/include/c++/${gcc_ver}/${CHOST}-frugalware-linux:/usr/include
 \
-                               -DLLVM_BINUTILS_INCDIR=/usr/include"
+                               -DLLVM_BINUTILS_INCDIR=/usr/include \
+                               -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=On \
+                               -DLIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=Off"
Finclude cmake

options+=('static')
@@ -116,6 +134,8 @@ build() {
Fexec cd ..
else
Fexec mv -f ../cfe-${_F_archive_ver}/ tools/clang
+               Fexec mv -f ../libcxx-${_F_archive_ver}/ projects/libcxx
+               Fexec mv -f ../libcxxabi-${_F_archive_ver}/ projects/libcxxabi
fi


@@ -158,7 +178,11 @@ build() {
Frm usr/include
Fmkdir usr/bin/
Fmv usr/i686-frugalware-linux/bin/llvm-config usr/bin/llvm-config32
+        Fsplit lib32-libc++ usr/lib32/libc++*
+       Fsplit lib32-libc++ usr/i686-frugalware-linux/include/c++/
+
Fsplit lib32-$pkgname-libs usr/lib32/\*.so\*
+
Fsplit lib32-$pkgname /\*

## 64-bit CMake options
@@ -208,6 +232,8 @@ build() {
Fsplit $pkgname-ocaml usr/lib/cmake/llvm/{Find,Add}OCaml.cmake
Fsplit $pkgname-ocaml 
usr/share/doc/$pkgname-$pkgver/html/tutorial/OCamlLangImpl*.html

+       Fsplit libc++ usr/lib/libc++*
+       Fsplit libc++ usr/include/c++/

Fsplit $pkgname-libs usr/lib/*.so*
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to