[arch-commits] Commit in emscripten/repos/community-x86_64 (10 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Wed Mar 11 19:31:58 UTC 2020
Date: Wednesday, March 11, 2020 @ 19:31:58
Author: svenstaro
Revision: 594601
archrelease: copy trunk to community-x86_64
Added:
emscripten/repos/community-x86_64/PKGBUILD
(from rev 594600, emscripten/trunk/PKGBUILD)
emscripten/repos/community-x86_64/arch-template.patch
(from rev 594600, emscripten/trunk/arch-template.patch)
emscripten/repos/community-x86_64/emscripten.install
(from rev 594600, emscripten/trunk/emscripten.install)
emscripten/repos/community-x86_64/emscripten.sh
(from rev 594600, emscripten/trunk/emscripten.sh)
emscripten/repos/community-x86_64/libcxxabi-include-libunwind.patch
(from rev 594600, emscripten/trunk/libcxxabi-include-libunwind.patch)
Deleted:
emscripten/repos/community-x86_64/PKGBUILD
emscripten/repos/community-x86_64/arch-template.patch
emscripten/repos/community-x86_64/emscripten.install
emscripten/repos/community-x86_64/emscripten.sh
emscripten/repos/community-x86_64/libcxxabi-include-libunwind.patch
-----------------------------------+
PKGBUILD | 156 ++++++++++++++++++------------------
arch-template.patch | 50 +++++------
emscripten.install | 26 +++---
emscripten.sh | 4
libcxxabi-include-libunwind.patch | 28 +++---
5 files changed, 132 insertions(+), 132 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-11 19:31:07 UTC (rev 594600)
+++ PKGBUILD 2020-03-11 19:31:58 UTC (rev 594601)
@@ -1,78 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.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.39.10
-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 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
-# Get commit SHAs from here:
-# https://chromium.googlesource.com/emscripten-releases/+/refs/heads/master/DEPS
-source=(emscripten-$pkgver.tar.gz::"https://github.com/kripken/emscripten/archive/$pkgver.tar.gz"
- git+https://github.com/llvm/llvm-project.git#commit=411f1885b655ea622fe124a87a6eadfd988d7a5e
- "emscripten.sh"
- arch-template.patch
- libcxxabi-include-libunwind.patch)
-sha512sums=('00d8e0790f65f180271960bb59398294e7d37567c9f38b0b5a5ec3eb0f823c2d9a063cfa94e669a0445b2910e85a1fdeba85368813121dbe7844be4077ceae7f'
- 'SKIP'
- 'fbe9b95b8d18e7d0c6ec5fded6f11b72fbe4ddd0391e5704b281ba79c479f3563e82423b790ddf3f0554a23d659193ca898a81fe3db509f16c30c7188b790e4d'
- '04ffe0eac346d4accd54321aace952ccf3d6016243b98e3239de3fddc77c2c89ac4dfd66f65095c7f8a474e0e2b692bbbf3a150fde1dc410de920d5835f332a1'
- 'b124ff6110810e3190bf05deda478c6fef044ff55a435df978fdb7ff7b4f312186add48cb99946b67a2467f7e28855e36606209c3c4dcee2898762ccc2e4c2ed')
-
-prepare() {
- cd "$srcdir"/emscripten-$pkgver
-
- patch -Np1 --no-backup-if-mismatch -i "$srcdir"/arch-template.patch
- patch -Np1 --no-backup-if-mismatch -i "$srcdir"/libcxxabi-include-libunwind.patch
-
- mkdir "$srcdir"/llvm-project/llvm/build
-}
-
-build() {
- cd "$srcdir"/llvm-project/llvm/build
-
- # Inspired from https://github.com/WebAssembly/waterfall/blob/58e343a47ea02cb6daf19eefbdf626b23c24980c/src/build.py#L790
- 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_TOOL_LTO_BUILD=ON \
- -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON \
- -DLLVM_INCLUDE_EXAMPLES=OFF \
- -DLLVM_INCLUDE_TESTS=OFF \
- -DLLVM_ENABLE_PROJECTS="lld;clang" \
- -DCLANG_INCLUDE_TESTS=OFF
- ninja
-}
-
-package() {
- # Install LLVM stuff according to https://github.com/emscripten-core/emscripten/blob/incoming/docs/process.md
- install -d "$pkgdir"/usr/lib
- cp -r "$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
-}
Copied: emscripten/repos/community-x86_64/PKGBUILD (from rev 594600, emscripten/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-11 19:31:58 UTC (rev 594601)
@@ -0,0 +1,78 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.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.39.10
+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
+# Get commit SHAs from here:
+# https://chromium.googlesource.com/emscripten-releases/+/refs/heads/master/DEPS
+source=(emscripten-$pkgver.tar.gz::"https://github.com/kripken/emscripten/archive/$pkgver.tar.gz"
+ git+https://github.com/llvm/llvm-project.git#commit=2150a6d0d635dea12c23dc84f356deeacbc8fbc2
+ "emscripten.sh"
+ arch-template.patch
+ libcxxabi-include-libunwind.patch)
+sha512sums=('00d8e0790f65f180271960bb59398294e7d37567c9f38b0b5a5ec3eb0f823c2d9a063cfa94e669a0445b2910e85a1fdeba85368813121dbe7844be4077ceae7f'
+ 'SKIP'
+ 'fbe9b95b8d18e7d0c6ec5fded6f11b72fbe4ddd0391e5704b281ba79c479f3563e82423b790ddf3f0554a23d659193ca898a81fe3db509f16c30c7188b790e4d'
+ '04ffe0eac346d4accd54321aace952ccf3d6016243b98e3239de3fddc77c2c89ac4dfd66f65095c7f8a474e0e2b692bbbf3a150fde1dc410de920d5835f332a1'
+ 'b124ff6110810e3190bf05deda478c6fef044ff55a435df978fdb7ff7b4f312186add48cb99946b67a2467f7e28855e36606209c3c4dcee2898762ccc2e4c2ed')
+
+prepare() {
+ cd "$srcdir"/emscripten-$pkgver
+
+ patch -Np1 --no-backup-if-mismatch -i "$srcdir"/arch-template.patch
+ patch -Np1 --no-backup-if-mismatch -i "$srcdir"/libcxxabi-include-libunwind.patch
+
+ mkdir "$srcdir"/llvm-project/llvm/build
+}
+
+build() {
+ cd "$srcdir"/llvm-project/llvm/build
+
+ # Inspired from https://github.com/WebAssembly/waterfall/blob/58e343a47ea02cb6daf19eefbdf626b23c24980c/src/build.py#L790
+ 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_TOOL_LTO_BUILD=ON \
+ -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON \
+ -DLLVM_INCLUDE_EXAMPLES=OFF \
+ -DLLVM_INCLUDE_TESTS=OFF \
+ -DLLVM_ENABLE_PROJECTS="lld;clang" \
+ -DCLANG_INCLUDE_TESTS=OFF
+ ninja
+}
+
+package() {
+ # Install LLVM stuff according to https://github.com/emscripten-core/emscripten/blob/incoming/docs/process.md
+ install -d "$pkgdir"/usr/lib
+ cp -r "$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 tests 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: arch-template.patch
===================================================================
--- arch-template.patch 2020-03-11 19:31:07 UTC (rev 594600)
+++ arch-template.patch 2020-03-11 19:31:58 UTC (rev 594601)
@@ -1,25 +0,0 @@
-diff --git a/tools/settings_template.py b/tools/settings_template.py
-index f1ca646ea..3e85c7ab1 100644
---- a/tools/settings_template.py
-+++ b/tools/settings_template.py
-@@ -12,9 +12,9 @@ import os
-
- # This is used by external projects in order to find emscripten. It is not used
- # by emscripten itself.
--EMSCRIPTEN_ROOT = os.path.expanduser(os.getenv('EMSCRIPTEN', '{{{ EMSCRIPTEN_ROOT }}}')) # directory
-+EMSCRIPTEN_ROOT = "/usr/lib/emscripten"
-
--LLVM_ROOT = os.path.expanduser(os.getenv('LLVM', '{{{ LLVM_ROOT }}}')) # directory
-+LLVM_ROOT = "/usr/lib/emscripten-llvm"
- BINARYEN_ROOT = os.path.expanduser(os.getenv('BINARYEN', '')) # directory
-
- # Add this if you have manually built the JS optimizer executable (in
-@@ -43,7 +43,7 @@ JAVA = 'java' # executable
- # All JS engines to use when running the automatic tests. Not all the engines in
- # this list must exist (if they don't, they will be skipped in the test runner).
- #
--# JS_ENGINES = [NODE_JS] # add V8_ENGINE or SPIDERMONKEY_ENGINE if you have them installed too.
-+JS_ENGINES = [NODE_JS] # add V8_ENGINE or SPIDERMONKEY_ENGINE if you have them installed too.
- #
- # WASMER = os.path.expanduser(os.path.join('~', '.wasmer', 'bin', 'wasmer'))
- # WASMTIME = os.path.expanduser(os.path.join('~', 'wasmtime'))
Copied: emscripten/repos/community-x86_64/arch-template.patch (from rev 594600, emscripten/trunk/arch-template.patch)
===================================================================
--- arch-template.patch (rev 0)
+++ arch-template.patch 2020-03-11 19:31:58 UTC (rev 594601)
@@ -0,0 +1,25 @@
+diff --git a/tools/settings_template.py b/tools/settings_template.py
+index f1ca646ea..3e85c7ab1 100644
+--- a/tools/settings_template.py
++++ b/tools/settings_template.py
+@@ -12,9 +12,9 @@ import os
+
+ # This is used by external projects in order to find emscripten. It is not used
+ # by emscripten itself.
+-EMSCRIPTEN_ROOT = os.path.expanduser(os.getenv('EMSCRIPTEN', '{{{ EMSCRIPTEN_ROOT }}}')) # directory
++EMSCRIPTEN_ROOT = "/usr/lib/emscripten"
+
+-LLVM_ROOT = os.path.expanduser(os.getenv('LLVM', '{{{ LLVM_ROOT }}}')) # directory
++LLVM_ROOT = "/usr/lib/emscripten-llvm"
+ BINARYEN_ROOT = os.path.expanduser(os.getenv('BINARYEN', '')) # directory
+
+ # Add this if you have manually built the JS optimizer executable (in
+@@ -43,7 +43,7 @@ JAVA = 'java' # executable
+ # All JS engines to use when running the automatic tests. Not all the engines in
+ # this list must exist (if they don't, they will be skipped in the test runner).
+ #
+-# JS_ENGINES = [NODE_JS] # add V8_ENGINE or SPIDERMONKEY_ENGINE if you have them installed too.
++JS_ENGINES = [NODE_JS] # add V8_ENGINE or SPIDERMONKEY_ENGINE if you have them installed too.
+ #
+ # WASMER = os.path.expanduser(os.path.join('~', '.wasmer', 'bin', 'wasmer'))
+ # WASMTIME = os.path.expanduser(os.path.join('~', 'wasmtime'))
Deleted: emscripten.install
===================================================================
--- emscripten.install 2020-03-11 19:31:07 UTC (rev 594600)
+++ emscripten.install 2020-03-11 19:31:58 UTC (rev 594601)
@@ -1,13 +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"
- echo "You may also need to delete ~/.emscripten if emscripten complains about old paths"
- echo "or executables not found."
-}
Copied: emscripten/repos/community-x86_64/emscripten.install (from rev 594600, emscripten/trunk/emscripten.install)
===================================================================
--- emscripten.install (rev 0)
+++ emscripten.install 2020-03-11 19:31:58 UTC (rev 594601)
@@ -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 2020-03-11 19:31:07 UTC (rev 594600)
+++ emscripten.sh 2020-03-11 19:31:58 UTC (rev 594601)
@@ -1,2 +0,0 @@
-#!/bin/sh
-export PATH=$PATH:/usr/lib/emscripten
Copied: emscripten/repos/community-x86_64/emscripten.sh (from rev 594600, emscripten/trunk/emscripten.sh)
===================================================================
--- emscripten.sh (rev 0)
+++ emscripten.sh 2020-03-11 19:31:58 UTC (rev 594601)
@@ -0,0 +1,2 @@
+#!/bin/sh
+export PATH=$PATH:/usr/lib/emscripten
Deleted: libcxxabi-include-libunwind.patch
===================================================================
--- libcxxabi-include-libunwind.patch 2020-03-11 19:31:07 UTC (rev 594600)
+++ libcxxabi-include-libunwind.patch 2020-03-11 19:31:58 UTC (rev 594601)
@@ -1,14 +0,0 @@
-diff --git a/tools/system_libs.py b/tools/system_libs.py
-index a1e616fa4..0b483d835 100755
---- a/tools/system_libs.py
-+++ b/tools/system_libs.py
-@@ -856,6 +856,9 @@ class libcxxabi(CXXLibrary, NoExceptLibrary, MTLibrary):
- # revision: https://reviews.llvm.org/D64961
- '-D_LIBCXXABI_GUARD_ABI_ARM',
- ]
-+ includes = [
-+ ['system', 'lib', 'libunwind', 'include'],
-+ ]
-
- def get_cflags(self):
- cflags = super(libcxxabi, self).get_cflags()
Copied: emscripten/repos/community-x86_64/libcxxabi-include-libunwind.patch (from rev 594600, emscripten/trunk/libcxxabi-include-libunwind.patch)
===================================================================
--- libcxxabi-include-libunwind.patch (rev 0)
+++ libcxxabi-include-libunwind.patch 2020-03-11 19:31:58 UTC (rev 594601)
@@ -0,0 +1,14 @@
+diff --git a/tools/system_libs.py b/tools/system_libs.py
+index a1e616fa4..0b483d835 100755
+--- a/tools/system_libs.py
++++ b/tools/system_libs.py
+@@ -856,6 +856,9 @@ class libcxxabi(CXXLibrary, NoExceptLibrary, MTLibrary):
+ # revision: https://reviews.llvm.org/D64961
+ '-D_LIBCXXABI_GUARD_ABI_ARM',
+ ]
++ includes = [
++ ['system', 'lib', 'libunwind', 'include'],
++ ]
+
+ def get_cflags(self):
+ cflags = super(libcxxabi, self).get_cflags()
More information about the arch-commits
mailing list