Date: Friday, June 8, 2018 @ 02:55:22 Author: svenstaro Revision: 341923
archrelease: copy trunk to community-x86_64 Added: emscripten/repos/community-x86_64/PKGBUILD (from rev 341922, emscripten/trunk/PKGBUILD) emscripten/repos/community-x86_64/emscripten.install (from rev 341922, emscripten/trunk/emscripten.install) emscripten/repos/community-x86_64/emscripten.sh (from rev 341922, emscripten/trunk/emscripten.sh) Deleted: emscripten/repos/community-x86_64/PKGBUILD emscripten/repos/community-x86_64/emscripten.install emscripten/repos/community-x86_64/emscripten.sh emscripten/repos/community-x86_64/gcc8.patch --------------------+ PKGBUILD | 178 ++++++++++++++++++++++++--------------------------- emscripten.install | 22 +++--- emscripten.sh | 14 ++-- gcc8.patch | 31 -------- 4 files changed, 105 insertions(+), 140 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-08 02:55:13 UTC (rev 341922) +++ PKGBUILD 2018-06-08 02:55:22 UTC (rev 341923) @@ -1,91 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG -# Contributor: Stefan Husmann <stefan-husm...@t-online.de> -# Contributor: Vlad Kolotvin <vlad.kolot...@gmail.com> - -pkgname=emscripten -pkgver=1.38.1 -pkgrel=1 -pkgdesc="LLVM-based project that compiles C and C++ into highly-optimizable JavaScript for the web" -arch=('x86_64') -url="http://emscripten.org" -license=('custom') -depends=('nodejs' 'python' 'python2') -makedepends=('cmake' 'libxml2') -optdepends=('java-environment: for using clojure' - 'ruby: for using websockify addon') -install=$pkgname.install -source=(emscripten-$pkgver.tar.gz::"https://github.com/kripken/emscripten/archive/$pkgver.tar.gz" - emscripten-fastcomp-$pkgver.tar.gz::"https://github.com/kripken/emscripten-fastcomp/archive/$pkgver.tar.gz" - emscripten-fastcomp-clang-$pkgver.tar.gz::"https://github.com/kripken/emscripten-fastcomp-clang/archive/$pkgver.tar.gz" - "emscripten.sh" - gcc8.patch) -sha512sums=('5f67339fd901e97c5e3250e9359af819f84ed7ee0e7edb716cbf7e3b7ee5aed641b4f07e5db8366d63e076c5b6c6e180a26f459901f12b67964c6012e01542c7' - '06175f7fc8abfcae25c2a572ac3705ddc0cf1aba3749b12a58c556b4da1b19e61505d1780fc67c1a56441bbaf055238d0c9b9ab7b8078f3da10ad3721f2b74bf' - 'fef22d3f2151ec8baaffcde49a67aac81f60e983c894a91bb00544b4cf051cb983c0db2e7a7b04dc3f5e671ee1dc9299a8ad287027883fac7a0f520b2553f652' - '52007717c21c22f5d9f027268de2516e969f2ffb8e37121f75ca2697b7ddcde6c0be9636d19df7b3c2e89bc769f5361750c62f9fcb84d224cde3c8626bc9c93b' - '8a651fc545bb09c23da6f138b1cc4f0d92758e7084460a09c6306ee7f727d52b0f780b775b6ef6118db144482cbfb37ef3d3dd662e357ceec0e713b342931365') - -prepare() { - cd emscripten-fastcomp-$pkgver - - patch -Np1 -i "$srcdir"/gcc8.patch - - # reset folder for out-of-source build - rm -rf build - mkdir build - - # put clang source into the right place (http://git.io/i1GBkg) - rm -rf tools/clang - ln -s "$srcdir"/emscripten-fastcomp-clang-$pkgver tools/clang - - # python2 shebang fixes - cd ../emscripten-$pkgver - sed '1s|python$|python2|' -i $(find third_party tools -name \*.py) emrun - - # adapt config file template to use our custom environment variable and path - sed -e "s|getenv('LLVM')|getenv('EMSCRIPTEN_FASTCOMP')|" \ - -e 's|{{{ LLVM_ROOT }}}|/usr/lib/emscripten-fastcomp|' \ - -i tools/settings_template_readonly.py -} - -build() { - cd emscripten-fastcomp-$pkgver/build - - cmake .. \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=YES \ - -DLLVM_TARGETS_TO_BUILD="X86;JSBackend" \ - -DLLVM_BUILD_RUNTIME=OFF \ - -DLLVM_INCLUDE_EXAMPLES=OFF \ - -DLLVM_INCLUDE_TESTS=OFF \ - -DCLANG_INCLUDE_TESTS=OFF - make -} - -package() { - # exported variables - install -Dm755 "$srcdir"/emscripten.sh "$pkgdir"/etc/profile.d/emscripten.sh - - # LLVM-backend, TODO: include only needed tools - cd "$srcdir"/emscripten-fastcomp-$pkgver - install -Dm644 emscripten-version.txt "$pkgdir"/usr/lib/emscripten-fastcomp/emscripten-version.txt - install -m755 build/bin/* "$pkgdir"/usr/lib/emscripten-fastcomp - - # copy structure - cd "$srcdir"/emscripten-$pkgver - install -d "$pkgdir"/usr/lib/emscripten - cp -rup em* cmake site src system third_party tools "$pkgdir"/usr/lib/emscripten - - # remove clutter - rm "$pkgdir"/usr/lib/emscripten-fastcomp/{*-test,llvm-lit} - rm "$pkgdir"/usr/lib/emscripten/*.bat - - # docs - install -d "$pkgdir"/usr/share/doc - ln -s /usr/lib/emscripten/site/source/docs "$pkgdir"/usr/share/doc/$pkgname - - # license - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} Copied: emscripten/repos/community-x86_64/PKGBUILD (from rev 341922, emscripten/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-08 02:55:22 UTC (rev 341923) @@ -0,0 +1,87 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG +# Contributor: Stefan Husmann <stefan-husm...@t-online.de> +# Contributor: Vlad Kolotvin <vlad.kolot...@gmail.com> + +pkgname=emscripten +pkgver=1.38.5 +pkgrel=1 +pkgdesc="LLVM-based project that compiles C and C++ into highly-optimizable JavaScript for the web" +arch=('x86_64') +url="http://emscripten.org" +license=('custom') +depends=('nodejs' 'python' 'python2') +makedepends=('cmake' 'libxml2') +optdepends=('java-environment: for using clojure' + 'ruby: for using websockify addon') +install=$pkgname.install +source=(emscripten-$pkgver.tar.gz::"https://github.com/kripken/emscripten/archive/$pkgver.tar.gz" + emscripten-fastcomp-$pkgver.tar.gz::"https://github.com/kripken/emscripten-fastcomp/archive/$pkgver.tar.gz" + emscripten-fastcomp-clang-$pkgver.tar.gz::"https://github.com/kripken/emscripten-fastcomp-clang/archive/$pkgver.tar.gz" + "emscripten.sh") +sha512sums=('fd863e0fb2b8eaa9bf089820de9e8c2d7984c6ecbd74c11a91eebeb16ffc5a4b85aa7e68e91229b2aa00b80d2c6bb72afb13e22e3ad026387677d94fcdf030af' + 'bf2b7edf32496af145ae9b27965ea5cadfa72d81a2809cbb36cdea31552c4b03091c2c4f7899d4e525fc99d67158b5c1649c75d099ce7d8176fdb89b26a721b7' + 'c45fee56203977d1952272a03f2535a353b9c72e1402f1f846c77e179719d74f02f8bf244365a833ea41d16e361acfa5ce1ee77f61242cbce190808ec85efb92' + '52007717c21c22f5d9f027268de2516e969f2ffb8e37121f75ca2697b7ddcde6c0be9636d19df7b3c2e89bc769f5361750c62f9fcb84d224cde3c8626bc9c93b') + +prepare() { + cd emscripten-fastcomp-$pkgver + + # reset folder for out-of-source build + rm -rf build + mkdir build + + # put clang source into the right place (http://git.io/i1GBkg) + rm -rf tools/clang + ln -s "$srcdir"/emscripten-fastcomp-clang-$pkgver tools/clang + + # python2 shebang fixes + cd ../emscripten-$pkgver + sed '1s|python$|python2|' -i $(find third_party tools -name \*.py) emrun + + # adapt config file template to use our custom environment variable and path + sed -e "s|getenv('LLVM')|getenv('EMSCRIPTEN_FASTCOMP')|" \ + -e 's|{{{ LLVM_ROOT }}}|/usr/lib/emscripten-fastcomp|' \ + -i tools/settings_template_readonly.py +} + +build() { + cd emscripten-fastcomp-$pkgver/build + + cmake .. \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=YES \ + -DLLVM_TARGETS_TO_BUILD="X86;JSBackend" \ + -DLLVM_BUILD_RUNTIME=OFF \ + -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_INCLUDE_TESTS=OFF \ + -DCLANG_INCLUDE_TESTS=OFF + make +} + +package() { + # exported variables + install -Dm755 "$srcdir"/emscripten.sh "$pkgdir"/etc/profile.d/emscripten.sh + + # LLVM-backend, TODO: include only needed tools + cd "$srcdir"/emscripten-fastcomp-$pkgver + install -Dm644 emscripten-version.txt "$pkgdir"/usr/lib/emscripten-fastcomp/emscripten-version.txt + install -m755 build/bin/* "$pkgdir"/usr/lib/emscripten-fastcomp + + # copy structure + cd "$srcdir"/emscripten-$pkgver + install -d "$pkgdir"/usr/lib/emscripten + cp -rup em* cmake site src system third_party tools "$pkgdir"/usr/lib/emscripten + + # remove clutter + rm "$pkgdir"/usr/lib/emscripten-fastcomp/{*-test,llvm-lit} + rm "$pkgdir"/usr/lib/emscripten/*.bat + + # docs + install -d "$pkgdir"/usr/share/doc + ln -s /usr/lib/emscripten/site/source/docs "$pkgdir"/usr/share/doc/$pkgname + + # license + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} Deleted: emscripten.install =================================================================== --- emscripten.install 2018-06-08 02:55:13 UTC (rev 341922) +++ emscripten.install 2018-06-08 02:55:22 UTC (rev 341923) @@ -1,11 +0,0 @@ - -post_install() { - echo "=> You need to login again or 'source /etc/profile.d/emscripten.sh' in your" - echo "=> already running shells to be able to use emscripten." -} - -post_upgrade() { - echo "=> You may need to manually clear your emscripten cache as clang may not link" - echo "=> the new library versions with cached data properly. Use this command:" - echo " $ emcc --clear-cache" -} Copied: emscripten/repos/community-x86_64/emscripten.install (from rev 341922, emscripten/trunk/emscripten.install) =================================================================== --- emscripten.install (rev 0) +++ emscripten.install 2018-06-08 02:55:22 UTC (rev 341923) @@ -0,0 +1,11 @@ + +post_install() { + echo "=> You need to login again or 'source /etc/profile.d/emscripten.sh' in your" + echo "=> already running shells to be able to use emscripten." +} + +post_upgrade() { + echo "=> You may need to manually clear your emscripten cache as clang may not link" + echo "=> the new library versions with cached data properly. Use this command:" + echo " $ emcc --clear-cache" +} Deleted: emscripten.sh =================================================================== --- emscripten.sh 2018-06-08 02:55:13 UTC (rev 341922) +++ emscripten.sh 2018-06-08 02:55:22 UTC (rev 341923) @@ -1,7 +0,0 @@ -#!/bin/sh - -export EMSCRIPTEN="/usr/lib/emscripten" -export EMSCRIPTEN_FASTCOMP="/usr/lib/emscripten-fastcomp" - -# add to path -export PATH=$PATH:$EMSCRIPTEN Copied: emscripten/repos/community-x86_64/emscripten.sh (from rev 341922, emscripten/trunk/emscripten.sh) =================================================================== --- emscripten.sh (rev 0) +++ emscripten.sh 2018-06-08 02:55:22 UTC (rev 341923) @@ -0,0 +1,7 @@ +#!/bin/sh + +export EMSCRIPTEN="/usr/lib/emscripten" +export EMSCRIPTEN_FASTCOMP="/usr/lib/emscripten-fastcomp" + +# add to path +export PATH=$PATH:$EMSCRIPTEN Deleted: gcc8.patch =================================================================== --- gcc8.patch 2018-06-08 02:55:13 UTC (rev 341922) +++ gcc8.patch 2018-06-08 02:55:22 UTC (rev 341923) @@ -1,31 +0,0 @@ -From 5cea35478aaaac7728a50cbafd3770f96162f7ac Mon Sep 17 00:00:00 2001 -From: Tilmann Scheller <tsche...@redhat.com> -Date: Thu, 1 Feb 2018 11:40:01 -0600 -Subject: [PATCH] Fix return type in ORC readMem() client interface. - -GCC 8.0.1 detects the type mismatch and causes the compilation to fail. Clang -and earlier versions of GCC don't detect the issue. - -Fixes rhbz#1540620. ---- - include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -index da02250ba16..bed472e2e0e 100644 ---- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -+++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -@@ -713,8 +713,8 @@ private: - - uint32_t getTrampolineSize() const { return RemoteTrampolineSize; } - -- Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src, -- uint64_t Size) { -+ Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src, -+ uint64_t Size) { - // Check for an 'out-of-band' error, e.g. from an MM destructor. - if (ExistingError) - return std::move(ExistingError); --- -2.16.1 -