Date: Wednesday, May 16, 2018 @ 07:56:32
  Author: svenstaro
Revision: 322574

archrelease: copy trunk to community-x86_64

Added:
  emscripten/repos/community-x86_64/PKGBUILD
    (from rev 322573, emscripten/trunk/PKGBUILD)
  emscripten/repos/community-x86_64/emscripten.install
    (from rev 322573, emscripten/trunk/emscripten.install)
  emscripten/repos/community-x86_64/emscripten.sh
    (from rev 322573, emscripten/trunk/emscripten.sh)
  emscripten/repos/community-x86_64/gcc8.patch
    (from rev 322573, emscripten/trunk/gcc8.patch)
Deleted:
  emscripten/repos/community-x86_64/PKGBUILD
  emscripten/repos/community-x86_64/emscripten.install
  emscripten/repos/community-x86_64/emscripten.sh

--------------------+
 PKGBUILD           |  177 ++++++++++++++++++++++++++-------------------------
 emscripten.install |   22 +++---
 emscripten.sh      |   14 ++--
 gcc8.patch         |   31 ++++++++
 4 files changed, 140 insertions(+), 104 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2018-05-16 07:56:18 UTC (rev 322573)
+++ PKGBUILD    2018-05-16 07:56:32 UTC (rev 322574)
@@ -1,86 +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.37.36
-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=('55b39c7bc44ed3928d46563f835f76f9be87fbbdd461dd29d3e638128d3dac66aa1f111823151e9106f77fa34219c61b575eea2c27f49fa7e73c96a090ccb388'
-            
'9a43274714834c809aae8cc96cba217b2c0e4e335b56cb651d27f5a68a41e2beeec4ce0ba1c4041de125a281b0241a0070fbb5a70db13e4f08943ab6fa295d87'
-            
'1cbfbf594d59852a3cde236f81251e944fbb0f467ed6733881cd30ae72b25e0d7df60bd61ee76b5aed3bf6fe95d1d0058d3c18aa4d48e5533c20b0c986197ed9'
-            
'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
-
-  CC=gcc CXX=g++ 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 322573, 
emscripten/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2018-05-16 07:56:32 UTC (rev 322574)
@@ -0,0 +1,91 @@
+# 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.0
+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=('5e28dd7f3b89c9404ca04f55b1a184e61629aeb25b46ad87700860efd472cc276b9741f22a9d48f034275369cfe7a01d6c3cd4765d6626aa9773e0dfa8542e38'
+            
'e7860e3bba4b5c8c5312a2b1f5ee6d6d6a2e0afb35be2073efe7263dc217b95b1adb39675a01c9b6f89ec940736d68beac9d0173c1fd4a985b8e046fcaa1206f'
+            
'85069ba90db1306ab960e2b3d04fc89516f8672672b872aa615f8f368dc34b922115e8fc44dc8fca9470c63c147b9faff888dda55d112c7c55a5f5850483ee63'
+            
'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
+}

Deleted: emscripten.install
===================================================================
--- emscripten.install  2018-05-16 07:56:18 UTC (rev 322573)
+++ emscripten.install  2018-05-16 07:56:32 UTC (rev 322574)
@@ -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 322573, 
emscripten/trunk/emscripten.install)
===================================================================
--- emscripten.install                          (rev 0)
+++ emscripten.install  2018-05-16 07:56:32 UTC (rev 322574)
@@ -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-05-16 07:56:18 UTC (rev 322573)
+++ emscripten.sh       2018-05-16 07:56:32 UTC (rev 322574)
@@ -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 322573, 
emscripten/trunk/emscripten.sh)
===================================================================
--- emscripten.sh                               (rev 0)
+++ emscripten.sh       2018-05-16 07:56:32 UTC (rev 322574)
@@ -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

Copied: emscripten/repos/community-x86_64/gcc8.patch (from rev 322573, 
emscripten/trunk/gcc8.patch)
===================================================================
--- gcc8.patch                          (rev 0)
+++ gcc8.patch  2018-05-16 07:56:32 UTC (rev 322574)
@@ -0,0 +1,31 @@
+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
+

Reply via email to