diff options
| -rw-r--r-- | libraries/libc++/libc++.SlackBuild | 86 | ||||
| -rw-r--r-- | libraries/libc++/libc++.info | 6 | ||||
| -rw-r--r-- | libraries/libc++/slack-desc | 2 |
3 files changed, 40 insertions, 54 deletions
diff --git a/libraries/libc++/libc++.SlackBuild b/libraries/libc++/libc++.SlackBuild index ec6f66d40b..8df3cbd82a 100644 --- a/libraries/libc++/libc++.SlackBuild +++ b/libraries/libc++/libc++.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for libc++ # Copyright 2017 Coastal Carolina University +# Copyright 2020 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,15 +25,9 @@ PRGNAM=libc++ VERSION=${VERSION:-3.8.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -SOURCES=( - llvm-${VERSION}.src.tar.xz - libcxxabi-${VERSION}.src.tar.xz - libcxx-${VERSION}.src.tar.xz -) - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -60,22 +55,24 @@ else LIBDIRSUFFIX="" fi -set -e +set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT - cd $TMP -rm -rf llvm-${VERSION} -tar xvf $CWD/${SOURCES[0]} -mv llvm-${VERSION}.src llvm-${VERSION} - -cd llvm-${VERSION}/projects -tar xvf $CWD/${SOURCES[1]} -tar xvf $CWD/${SOURCES[2]} -mv libcxx-${VERSION}.src libcxx -mv libcxxabi-${VERSION}.src libcxxabi -cd .. +rm -rf $PRGNAM-$VERSION +mkdir $PRGNAM-$VERSION +cd $PRGNAM-$VERSION +tar xvf $CWD/llvm-$VERSION.src.tar.xz +cd llvm-$VERSION.src + +( + cd projects + tar xvf $CWD/libcxx-$VERSION.src.tar.xz + mv libcxx-$VERSION.src libcxx + tar xvf $CWD/libcxxabi-$VERSION.src.tar.xz + mv libcxxabi-$VERSION.src libcxxabi +) chown -R root:root . find -L . \ @@ -84,43 +81,32 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -cd $TMP -rm -rf build mkdir -p build - cd build -CC=clang CXX=clang++ cmake \ - -G "Unix Makefiles" \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLLVM_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \ - -DLLVM_ENABLE_SPHINX=ON \ - -DLIBCXX_INCLUDE_DOCS=ON \ - ../llvm-${VERSION} - -# This break with unknown option: LLVM_BUILD_32_BITS -#make cxx docs-libcxx-html -make install-libcxx DESTDIR=${PKG} -make install-libcxxabi DESTDIR=${PKG} - + cmake \ + -DCMAKE_C_COMPILER="clang" \ + -DCMAKE_CXX_COMPILER="clang++" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLLVM_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \ + -DLIBCXX_INCLUDE_DOCS=ON \ + -DCMAKE_BUILD_TYPE=Release .. + make install-libcxx install-libcxxabi DESTDIR=$PKG cd .. -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp llvm-${VERSION}/projects/libcxx/CREDITS.TXT \ - $PKG/usr/doc/${PRGNAM}-${VERSION}/libcxx-CREDITS.TXT -cp llvm-${VERSION}/projects/libcxx/LICENSE.TXT \ - $PKG/usr/doc/${PRGNAM}-${VERSION}/libcxx-LICENSE.TXT -cp llvm-${VERSION}/projects/libcxxabi/CREDITS.TXT \ - $PKG/usr/doc/${PRGNAM}-${VERSION}/libcxxabi-CREDITS.TXT -cp llvm-${VERSION}/projects/libcxx/LICENSE.TXT \ - $PKG/usr/doc/${PRGNAM}-${VERSION}/libcxxabi-LICENSE.TXT -#cp -a build/projects/libcxx/docs/html $PKG/usr/doc/${PRGNAM}-${VERSION} - +cp projects/libcxx/CREDITS.TXT \ + $PKG/usr/doc/$PRGNAM-$VERSION/libcxx-CREDITS.TXT +cp projects/libcxx/LICENSE.TXT \ + $PKG/usr/doc/$PRGNAM-$VERSION/libcxx-LICENSE.TXT +cp projects/libcxxabi/CREDITS.TXT \ + $PKG/usr/doc/$PRGNAM-$VERSION/libcxxabi-CREDITS.TXT +cp projects/libcxxabi/LICENSE.TXT \ + $PKG/usr/doc/$PRGNAM-$VERSION/libcxxabi-LICENSE.TXT cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/libc++/libc++.info b/libraries/libc++/libc++.info index 7d803612bb..9fd41afe86 100644 --- a/libraries/libc++/libc++.info +++ b/libraries/libc++/libc++.info @@ -9,6 +9,6 @@ MD5SUM="07a7a74f3c6bd65de4702bf941b511a0 \ bbe6b4d72c7c5978550d370af529bcf7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libunwind Sphinx" -MAINTAINER="Dr. Mike Murphy" -EMAIL="mmurphy2@coastal.edu" +REQUIRES="libunwind" +MAINTAINER="Hunter Sezen" +EMAIL="orbea@riseup.net" diff --git a/libraries/libc++/slack-desc b/libraries/libc++/slack-desc index d59c7ba0fc..3991a810fa 100644 --- a/libraries/libc++/slack-desc +++ b/libraries/libc++/slack-desc @@ -11,9 +11,9 @@ libc++: libc++: libc++ is a new implementation of the C++ standard library, libc++: targeting C++11. libc++: +libc++: Homepage: http://libcxx.llvm.org/ libc++: libc++: libc++: libc++: -libc++: Project Website: http://libcxx.llvm.org/ libc++: |