Date: Monday, June 15, 2020 @ 02:00:17 Author: svenstaro Revision: 644758
upgpkg: emscripten 1.39.18-1 Modified: emscripten/trunk/PKGBUILD emscripten/trunk/emscripten-config Deleted: emscripten/trunk/11355.patch -------------------+ 11355.patch | 36 ------------------------------ PKGBUILD | 11 +-------- emscripten-config | 61 ++++------------------------------------------------ 3 files changed, 7 insertions(+), 101 deletions(-) Deleted: 11355.patch =================================================================== --- 11355.patch 2020-06-15 01:11:19 UTC (rev 644757) +++ 11355.patch 2020-06-15 02:00:17 UTC (rev 644758) @@ -1,36 +0,0 @@ -From 47a523470e08a719f165549f59cd78baef4c7540 Mon Sep 17 00:00:00 2001 -From: Sven-Hendrik Haase <[email protected]> -Date: Fri, 5 Jun 2020 08:54:48 +0200 -Subject: [PATCH] Use DESTDIR instead of uncommon DISTDIR - -It's quite common to see DESTDIR being used with Makefiles but DISTDIR is very uncommon. ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 4d9948adeec..d213abdc27d 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,17 +1,17 @@ - VERSION=$(shell cat emscripten-version.txt | sed s/\"//g) --DISTDIR=../emscripten-$(VERSION) -+DESTDIR=../emscripten-$(VERSION) - DISTFILE=emscripten-$(VERSION).tar.bz2 - - dist: $(DISTFILE) - - install: -- @rm -rf $(DISTDIR) -- ./tools/install.py $(DISTDIR) -+ @rm -rf $(DESTDIR) -+ ./tools/install.py $(DESTDIR) - - # Create an distributable archive of emscripten suitable for use - # by end users. This archive excludes parts of the codebase that - # are you only used by emscripten developers. - $(DISTFILE): install -- tar cf $@ $(EXCLUDE_PATTERN) -C `dirname $(DISTDIR)` `basename $(DISTDIR)` -+ tar cf $@ $(EXCLUDE_PATTERN) -C `dirname $(DESTDIR)` `basename $(DESTDIR)` - - .PHONY: dist install Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-15 01:11:19 UTC (rev 644757) +++ PKGBUILD 2020-06-15 02:00:17 UTC (rev 644758) @@ -4,7 +4,7 @@ # Contributor: Vlad Kolotvin <[email protected]> pkgname=emscripten -pkgver=1.39.17 +pkgver=1.39.18 pkgrel=1 pkgdesc="LLVM-based project that compiles C and C++ into highly-optimizable JavaScript for the web" arch=('x86_64') @@ -20,21 +20,18 @@ # https://chromium.googlesource.com/emscripten-releases/+/refs/heads/master/DEPS source=("git+https://github.com/kripken/emscripten#tag=$pkgver"; git+https://github.com/llvm/llvm-project.git#commit=4c735439fd9a0cfea9ae366df8b36281436d4708 - https://github.com/emscripten-core/emscripten/pull/11355.patch "emscripten.sh" emscripten-config libcxxabi-include-libunwind.patch) sha512sums=('SKIP' 'SKIP' - 'ea8dc41ace8e8628b24e68a39ceb7a82a51fa9f1501adb09c9799a1105a0becf2be54ec78149e115797b84b646dffe92180bbe3f276aef143cb318d9ac7e6335' 'fbe9b95b8d18e7d0c6ec5fded6f11b72fbe4ddd0391e5704b281ba79c479f3563e82423b790ddf3f0554a23d659193ca898a81fe3db509f16c30c7188b790e4d' - 'd273785602bb7b199e22269bdc7fdc6190a8dd4defe0bfa3e41455c4e3c40d647dcc82c64c13024fb071e0f16bb094a7a30b773eb39fe84027d637c918cd39a6' + '1d60b8942f3487c034b7fadb5ab1aeb603131611331ae1c9e8364180ca3a5fadb11f39a30c7f6167080b5e8ba0b1588a3bf42d8904807201cd8c5d6df0653419' 'b124ff6110810e3190bf05deda478c6fef044ff55a435df978fdb7ff7b4f312186add48cb99946b67a2467f7e28855e36606209c3c4dcee2898762ccc2e4c2ed') prepare() { cd emscripten - patch -Np1 --no-backup-if-mismatch -i "$srcdir"/11355.patch patch -Np1 --no-backup-if-mismatch -i "$srcdir"/libcxxabi-include-libunwind.patch } @@ -68,10 +65,6 @@ make DESTDIR="$pkgdir"/usr/lib/emscripten install install -Dm644 "$srcdir"/emscripten-config "$pkgdir"/usr/lib/emscripten/.emscripten - # Remove clutter - # See https://github.com/emscripten-core/emscripten/issues/11358 - rm -r "$pkgdir"/usr/lib/emscripten/{*.bat,.circleci,.clang-format,.editorconfig,.flake8,.gitattributes,.github,.gitignore} - 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 Modified: emscripten-config =================================================================== --- emscripten-config 2020-06-15 01:11:19 UTC (rev 644757) +++ emscripten-config 2020-06-15 02:00:17 UTC (rev 644758) @@ -1,56 +1,5 @@ -# Note: If you put paths relative to the home directory, do not forget -# os.path.expanduser -# -# Any config setting <KEY> in this file can be overridden by setting the -# EM_<KEY> environment variable. For example, settings EM_LLVM_ROOT override -# the setting in this file. -# -# Note: On Windows, remember to escape backslashes! I.e. LLVM='c:\llvm\' -# is not valid, but LLVM='c:\\llvm\\' and LLVM='c:/llvm/' -# are. - -import os - -# This is used by external projects in order to find emscripten. It is not used -# by emscripten itself. -EMSCRIPTEN_ROOT = "/usr/lib/emscripten" - -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 -# Emscripten/tools/optimizer) and want to run it from a custom location. -# Alternatively, you can set this as the environment variable -# EMSCRIPTEN_NATIVE_OPTIMIZER. -# EMSCRIPTEN_NATIVE_OPTIMIZER='/path/to/custom/optimizer(.exe)' - -# Location of the node binary to use for running the JS parts of the compiler. -# This engine must exist, or nothing can be compiled. -NODE_JS = os.path.expanduser(os.getenv('NODE', '/usr/bin/node')) # executable - -JAVA = 'java' # executable - -################################################################################ -# -# Test suite options: -# -# Alternative JS engines to use during testing: -# -# SPIDERMONKEY_ENGINE = [os.path.expanduser(os.getenv('SPIDERMONKEY', 'js'))] # executable -# V8_ENGINE = os.path.expanduser(os.getenv('V8', 'd8')) # 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. -# -# WASMER = os.path.expanduser(os.path.join('~', '.wasmer', 'bin', 'wasmer')) -# WASMTIME = os.path.expanduser(os.path.join('~', 'wasmtime')) -# -# Wasm engines to use in STANDALONE_WASM tests. -# -# WASM_ENGINES = [] # add WASMER or WASMTIME if you have them installed -# -# Other options -# -# FROZEN_CACHE = True # never clears the cache, and disallows building to the cache +NODE_JS = '/usr/bin/node' +LLVM_ROOT = '/usr/lib/emscripten-llvm' +BINARYEN_ROOT = '/usr' +EMSCRIPTEN_ROOT = '/usr/lib/emscripten' +JAVA = 'java'
