[arch-commits] Commit in emscripten/repos/community-x86_64 (6 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Wed Jun 19 09:41:52 UTC 2019


    Date: Wednesday, June 19, 2019 @ 09:41:51
  Author: svenstaro
Revision: 482322

archrelease: copy trunk to community-x86_64

Added:
  emscripten/repos/community-x86_64/PKGBUILD
    (from rev 482321, emscripten/trunk/PKGBUILD)
  emscripten/repos/community-x86_64/emscripten.install
    (from rev 482321, emscripten/trunk/emscripten.install)
  emscripten/repos/community-x86_64/emscripten.sh
    (from rev 482321, 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

--------------------+
 PKGBUILD           |  158 ++++++++++++++++++++++-----------------------------
 emscripten.install |   24 ++++---
 emscripten.sh      |    9 --
 3 files changed, 84 insertions(+), 107 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-19 09:41:40 UTC (rev 482321)
+++ PKGBUILD	2019-06-19 09:41:51 UTC (rev 482322)
@@ -1,89 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Vlad Kolotvin <vlad.kolotvin at gmail.com>
-
-pkgname=emscripten
-pkgver=1.38.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')
-makedepends=('cmake' 'libxml2')
-optdepends=('java-environment: for using clojure'
-            'ruby: for using websockify addon'
-            'cmake: for emcc --show-ports')
-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=('70ec76c0e196c2e91182adb144eace500c00ae35f4a78b5818d059eeb05e875d93216e344631a32324e55dda51c290e9772c67bd59a837e08437eda11b25d026'
-            '5606353b02f82cb23628fa408ee21543f1733aeb5964b01bbf2a7fff84a3a13e44ad4bd96a266e7e918e2a32f12221bced4bdf501e2799906c6d5b4a1364465c'
-            '9d0e54bc15e0a60da3182e99728e5dd1723175c82ca03791bee6ac59fd5ae6bf9f3da673fc2b7b4fd91802d366c422ef22fe7fda909df720bf4ac37b2b36ab89'
-            '52007717c21c22f5d9f027268de2516e969f2ffb8e37121f75ca2697b7ddcde6c0be9636d19df7b3c2e89bc769f5361750c62f9fcb84d224cde3c8626bc9c93b')
-
-prepare() {
-  cd emscripten-fastcomp-$pkgver
-
-  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
-
-  cd ../emscripten-$pkgver
-
-  # 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/python \
-    -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
-
-  # Get rid of some duplicated binaries (see FS#61487).
-  for link in ++ -6.0 -cl -cpp; do
-      ln -sf clang "$pkgdir"/usr/lib/emscripten-fastcomp/clang$link
-  done
-}

Copied: emscripten/repos/community-x86_64/PKGBUILD (from rev 482321, emscripten/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-19 09:41:51 UTC (rev 482322)
@@ -0,0 +1,69 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Vlad Kolotvin <vlad.kolotvin at gmail.com>
+
+pkgname=emscripten
+pkgver=1.38.36
+pkgrel=2
+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 binaryen)
+makedepends=(cmake libxml2 git ninja)
+optdepends=('java-environment: for using clojure'
+            'ruby: for using websockify addon'
+            'cmake: for emcc --show-ports')
+install=emscripten.install
+source=(emscripten-$pkgver.tar.gz::"https://github.com/kripken/emscripten/archive/$pkgver.tar.gz"
+        git+https://github.com/llvm/llvm-project.git#commit=58dbe47
+        "emscripten.sh")
+sha512sums=('70ec76c0e196c2e91182adb144eace500c00ae35f4a78b5818d059eeb05e875d93216e344631a32324e55dda51c290e9772c67bd59a837e08437eda11b25d026'
+            'SKIP'
+            'fbe9b95b8d18e7d0c6ec5fded6f11b72fbe4ddd0391e5704b281ba79c479f3563e82423b790ddf3f0554a23d659193ca898a81fe3db509f16c30c7188b790e4d')
+
+prepare() {
+  cd "$srcdir"/emscripten-$pkgver
+
+  sed -i 's|EMSCRIPTEN_ROOT.*|EMSCRIPTEN_ROOT = "/usr/lib/emscripten"|g' tools/settings_template_readonly.py
+  sed -i 's|LLVM_ROOT.*|LLVM_ROOT = "/usr/lib/emscripten-llvm"|g' tools/settings_template_readonly.py
+
+  mkdir "$srcdir"/llvm-project/llvm/build
+}
+
+build() {
+  cd "$srcdir"/llvm-project/llvm/build
+
+  cmake .. \
+    -GNinja \
+    -DPYTHON_EXECUTABLE=/usr/bin/python \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=YES \
+    -DLLVM_TARGETS_TO_BUILD="X86;WebAssembly" \
+    -DLLVM_BUILD_RUNTIME=OFF \
+    -DLLVM_INCLUDE_EXAMPLES=OFF \
+    -DLLVM_INCLUDE_TESTS=OFF \
+    -DLLVM_ENABLE_PROJECTS="lld;clang" \
+    -DCLANG_INCLUDE_TESTS=OFF
+  ninja
+}
+
+package() {
+  # install LLVM stuff
+  install -d "$pkgdir"/usr/lib/emscripten-llvm
+  install -m755 "$srcdir"/llvm-project/llvm/build/bin/* "$pkgdir"/usr/lib/emscripten-llvm
+
+  # install emscripten
+  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/*.bat
+
+  install -d "$pkgdir"/usr/share/doc
+  ln -s /usr/lib/emscripten/site/source/docs "$pkgdir"/usr/share/doc/$pkgname
+  install -Dm755 "$srcdir"/emscripten.sh "$pkgdir"/etc/profile.d/emscripten.sh
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}

Deleted: emscripten.install
===================================================================
--- emscripten.install	2019-06-19 09:41:40 UTC (rev 482321)
+++ emscripten.install	2019-06-19 09:41:51 UTC (rev 482322)
@@ -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 482321, emscripten/trunk/emscripten.install)
===================================================================
--- emscripten.install	                        (rev 0)
+++ emscripten.install	2019-06-19 09:41:51 UTC (rev 482322)
@@ -0,0 +1,13 @@
+
+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"
+  echo "You may also need to delete ~/.emscripten if emscripten complains about old paths"
+  echo "or executables not found."
+}

Deleted: emscripten.sh
===================================================================
--- emscripten.sh	2019-06-19 09:41:40 UTC (rev 482321)
+++ emscripten.sh	2019-06-19 09:41:51 UTC (rev 482322)
@@ -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 482321, emscripten/trunk/emscripten.sh)
===================================================================
--- emscripten.sh	                        (rev 0)
+++ emscripten.sh	2019-06-19 09:41:51 UTC (rev 482322)
@@ -0,0 +1,2 @@
+#!/bin/sh
+export PATH=$PATH:/usr/lib/emscripten


More information about the arch-commits mailing list