From a770eb9cdbe3184caad664540e5c68fe606b7749 Mon Sep 17 00:00:00 2001 From: Harald Weiner Date: Mon, 27 Feb 2017 15:17:29 +0100 Subject: dev-util/emscripten: version bump to 1.37.3 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-util/emscripten-fastcomp/Manifest | 4 +- .../emscripten-fastcomp-1.37.1.ebuild | 52 --------------- .../emscripten-fastcomp-1.37.3.ebuild | 52 +++++++++++++++ .../files/1.37.1/CMakeLists.txt.patch | 10 --- .../files/1.37.1/Version.cpp.patch | 14 ---- .../files/1.37.3/CMakeLists.txt.patch | 10 +++ .../files/1.37.3/Version.cpp.patch | 14 ++++ dev-util/emscripten/Manifest | 2 +- dev-util/emscripten/emscripten-1.37.1.ebuild | 74 ---------------------- dev-util/emscripten/emscripten-1.37.3.ebuild | 73 +++++++++++++++++++++ dev-util/emscripten/files/1.37.1/emcc.patch | 16 ----- dev-util/emscripten/files/1.37.1/emcmake.patch | 16 ----- dev-util/emscripten/files/1.37.3/emcc.patch | 16 +++++ dev-util/emscripten/files/1.37.3/emcmake.patch | 16 +++++ 14 files changed, 184 insertions(+), 185 deletions(-) delete mode 100644 dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.1.ebuild create mode 100644 dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.3.ebuild delete mode 100644 dev-util/emscripten-fastcomp/files/1.37.1/CMakeLists.txt.patch delete mode 100644 dev-util/emscripten-fastcomp/files/1.37.1/Version.cpp.patch create mode 100644 dev-util/emscripten-fastcomp/files/1.37.3/CMakeLists.txt.patch create mode 100644 dev-util/emscripten-fastcomp/files/1.37.3/Version.cpp.patch delete mode 100644 dev-util/emscripten/emscripten-1.37.1.ebuild create mode 100644 dev-util/emscripten/emscripten-1.37.3.ebuild delete mode 100644 dev-util/emscripten/files/1.37.1/emcc.patch delete mode 100644 dev-util/emscripten/files/1.37.1/emcmake.patch create mode 100644 dev-util/emscripten/files/1.37.3/emcc.patch create mode 100644 dev-util/emscripten/files/1.37.3/emcmake.patch (limited to 'dev-util') diff --git a/dev-util/emscripten-fastcomp/Manifest b/dev-util/emscripten-fastcomp/Manifest index 48248d533..2c5eb865b 100644 --- a/dev-util/emscripten-fastcomp/Manifest +++ b/dev-util/emscripten-fastcomp/Manifest @@ -1,2 +1,2 @@ -DIST emscripten-fastcomp-1.37.1.tar.gz 26570470 SHA256 e73d8852d78aa466519d2fc4dc902a2069e0e7cc3cc0446bb0264133c7e9c5c9 SHA512 b14a597d58990e13b22d5591765019310c2190846d2c66017ed5a4b966d92b1907b059e18e3128aebc9bfb64d0a383ca4f7f64da3862ed9428ab12bb5989c339 WHIRLPOOL 8909f8d89a6caf237577eb45d62eddf2f5cab00b98672cde8871267ae28ac6a1dcbf316bcaee710ce8043f4e9ee5cc2b7ecc8fa83bcf2d4121e30d38fa59c590 -DIST emscripten-fastcomp-clang-1.37.1.tar.gz 14349735 SHA256 d7c8761652eafca1eaec0484f6021c14a5e6fbfc922d0b2551e37be458e39c8d SHA512 0b56ac358825f89aff474dab3735973e2b1bd58f4b16950765a80e7417e3938e857b474548ac1dd1d9ad629865866b6ad8ff5c6a0294e7795f530412a0160fd1 WHIRLPOOL 7a37a0e57fd356f1789d44f8db2799c16c14d3667b39bdf0607bcb983e5bc92c9daf4a113318d705fb4a8d22aac2f7b374dcb59ac1788ee320483076cda98c34 +DIST emscripten-fastcomp-1.37.3.tar.gz 26570412 SHA256 035f1e97247e7d7c6d381de3823926c5a10d2491ebc8312cbdf9fe010a4b4f36 SHA512 d1bd8c1358522b95dc2ca992d6f0e2aee6fdc209a8baa58ac7312633a1346dc301b2bda0add9cc3c4b576fce4ff17a6dd54fd93655f731e7395d21288d4f6b54 WHIRLPOOL 2e1ea8e453138cd9ba44f331311ba0f9bd992f3f9b2f106237dbd9518f411abdb53d2e2687e2ad97d9caa9e456bdc78a73e435cc51febed2da814b7ceab2e6ea +DIST emscripten-fastcomp-clang-1.37.3.tar.gz 14348776 SHA256 78b4434e40d7ca429a3a6e437b7edae774e310a56118b1ae10cd581b27eb6a25 SHA512 75fea6fdcfea1577333a9ab77b3081db79c07e483e78a27d1a6056163050f3f923d5ad88a24e85bef70561f5197c80eaa8b2fec87e4d24810fe7a926ff7d2319 WHIRLPOOL 3d27944faed1a44c439e810bae5513374cdb123f88f946cf9caf580203aa3651be9be9f0ca34da6c7c1914ef166c16f36cbcdbea50801e84a5da08e30e4bbeaa diff --git a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.1.ebuild b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.1.ebuild deleted file mode 100644 index 9d88ee46c..000000000 --- a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils python-single-r1 - -DESCRIPTION="Emscripten LLVM backend - Fastcomp is the default compiler core for Emscripten" -HOMEPAGE="http://emscripten.org/" -SRC_URI="https://github.com/kripken/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/kripken/${PN}-clang/archive/${PV}.tar.gz -> ${PN}-clang-${PV}.tar.gz" -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="UoI-NCSA" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -MY_DEPEND="${PYTHON_DEPS} - >=net-libs/nodejs-0.12.6" -DEPEND="${MY_DEPEND} - >=dev-util/cmake-3.4.3" -RDEPEND="${MY_DEPEND} - >=virtual/jre-1.5" - -src_prepare() { - eapply "${FILESDIR}/${PV}/CMakeLists.txt.patch" - cd "${S}/../${PN}-clang-${PV}" || \ - die "Could not change to directory '${S}/../${PN}-clang-${PV}'" - eapply "${FILESDIR}/${PV}/Version.cpp.patch" - cd "${S}" || die "Could not change to directory '${S}'" - eapply_user -} - -src_configure() { - # create symlink to tools/clang - ln -s "${WORKDIR}/${PN}-clang-${PV}/" "${WORKDIR}/${P}/tools/clang" \ - || die "Could not create symlink to tools/clang" - local mycmakeargs=( - # avoid clashes with sys-devel/llvm - -DCMAKE_INSTALL_PREFIX="/usr/share/${P}" - -DLLVM_TARGETS_TO_BUILD="X86;JSBackend" - -DLLVM_INCLUDE_EXAMPLES=OFF - -DLLVM_INCLUDE_TESTS=OFF - -DCLANG_INCLUDE_EXAMPLES=OFF - -DCLANG_INCLUDE_TESTS=OFF - -DCLANG_INCLUDE_DOCS=OFF - -DLLVM_INCLUDE_DOCS=OFF - ) - cmake-utils_src_configure -} diff --git a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.3.ebuild b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.3.ebuild new file mode 100644 index 000000000..a0b88e6d5 --- /dev/null +++ b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.37.3.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils python-single-r1 + +DESCRIPTION="Emscripten LLVM backend - Fastcomp is the default compiler core for Emscripten" +HOMEPAGE="http://emscripten.org/" +SRC_URI="https://github.com/kripken/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/kripken/${PN}-clang/archive/${PV}.tar.gz -> ${PN}-clang-${PV}.tar.gz" +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="UoI-NCSA" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +MY_DEPEND="${PYTHON_DEPS} + >=net-libs/nodejs-0.12.10" +DEPEND="${MY_DEPEND} + >=dev-util/cmake-3.4.3" +RDEPEND="${MY_DEPEND} + >=virtual/jre-1.5" + +src_prepare() { + eapply "${FILESDIR}/${PV}/CMakeLists.txt.patch" + cd "${S}/../${PN}-clang-${PV}" || \ + die "Could not change to directory '${S}/../${PN}-clang-${PV}'" + eapply "${FILESDIR}/${PV}/Version.cpp.patch" + cd "${S}" || die "Could not change to directory '${S}'" + eapply_user +} + +src_configure() { + # create symlink to tools/clang + ln -s "${WORKDIR}/${PN}-clang-${PV}/" "${WORKDIR}/${P}/tools/clang" \ + || die "Could not create symlink to tools/clang" + local mycmakeargs=( + # avoid clashes with sys-devel/llvm + -DCMAKE_INSTALL_PREFIX="/usr/share/${P}" + -DLLVM_TARGETS_TO_BUILD="X86;JSBackend" + -DLLVM_INCLUDE_EXAMPLES=OFF + -DLLVM_INCLUDE_TESTS=OFF + -DCLANG_INCLUDE_EXAMPLES=OFF + -DCLANG_INCLUDE_TESTS=OFF + -DCLANG_INCLUDE_DOCS=OFF + -DLLVM_INCLUDE_DOCS=OFF + ) + cmake-utils_src_configure +} diff --git a/dev-util/emscripten-fastcomp/files/1.37.1/CMakeLists.txt.patch b/dev-util/emscripten-fastcomp/files/1.37.1/CMakeLists.txt.patch deleted file mode 100644 index d053132a3..000000000 --- a/dev-util/emscripten-fastcomp/files/1.37.1/CMakeLists.txt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt.orig 2016-05-12 13:26:02.739443914 +0200 -+++ b/CMakeLists.txt 2016-05-12 13:26:26.448733236 +0200 -@@ -175,7 +175,7 @@ - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - - if (CMAKE_BUILD_TYPE AND -- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") -+ NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|GENTOO)$") - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - endif() diff --git a/dev-util/emscripten-fastcomp/files/1.37.1/Version.cpp.patch b/dev-util/emscripten-fastcomp/files/1.37.1/Version.cpp.patch deleted file mode 100644 index 291a1ea6d..000000000 --- a/dev-util/emscripten-fastcomp/files/1.37.1/Version.cpp.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/lib/Basic/Version.cpp 2016-03-17 23:31:35.160129074 +0100 -+++ b/lib/Basic/Version.cpp 2016-03-17 23:32:07.722127712 +0100 -@@ -135,9 +135,9 @@ - - // XXX EMSCRIPTEN: show our versions - OS << " (emscripten " --#include "../../../../emscripten-version.txt" -+#include "../../emscripten-version.txt" - " : " --#include "../../../../tools/clang/emscripten-version.txt" -+#include "../../emscripten-version.txt" - ")"; - - return OS.str(); diff --git a/dev-util/emscripten-fastcomp/files/1.37.3/CMakeLists.txt.patch b/dev-util/emscripten-fastcomp/files/1.37.3/CMakeLists.txt.patch new file mode 100644 index 000000000..d053132a3 --- /dev/null +++ b/dev-util/emscripten-fastcomp/files/1.37.3/CMakeLists.txt.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt.orig 2016-05-12 13:26:02.739443914 +0200 ++++ b/CMakeLists.txt 2016-05-12 13:26:26.448733236 +0200 +@@ -175,7 +175,7 @@ + string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) + + if (CMAKE_BUILD_TYPE AND +- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") ++ NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|GENTOO)$") + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() diff --git a/dev-util/emscripten-fastcomp/files/1.37.3/Version.cpp.patch b/dev-util/emscripten-fastcomp/files/1.37.3/Version.cpp.patch new file mode 100644 index 000000000..291a1ea6d --- /dev/null +++ b/dev-util/emscripten-fastcomp/files/1.37.3/Version.cpp.patch @@ -0,0 +1,14 @@ +--- a/lib/Basic/Version.cpp 2016-03-17 23:31:35.160129074 +0100 ++++ b/lib/Basic/Version.cpp 2016-03-17 23:32:07.722127712 +0100 +@@ -135,9 +135,9 @@ + + // XXX EMSCRIPTEN: show our versions + OS << " (emscripten " +-#include "../../../../emscripten-version.txt" ++#include "../../emscripten-version.txt" + " : " +-#include "../../../../tools/clang/emscripten-version.txt" ++#include "../../emscripten-version.txt" + ")"; + + return OS.str(); diff --git a/dev-util/emscripten/Manifest b/dev-util/emscripten/Manifest index f9194b212..900ba0031 100644 --- a/dev-util/emscripten/Manifest +++ b/dev-util/emscripten/Manifest @@ -1 +1 @@ -DIST emscripten-1.37.1.tar.gz 32114501 SHA256 f553e7e5ab3611501b0478513f6d96f343027b04bd0317bb2c7239ebbfddf523 SHA512 99676dc3731a511615e06eb21e8ffd762d775fefd59164594bbe79505d3f02f35db173e98579587c20a9c7d28df13844497f282baece07e84eb581dad7c50bab WHIRLPOOL 45cfdded2e9f186a6a5af3ab05af67922712e039453778fcdb187ab77dd49c91b865803e376adaf905c9e556b0577a7196897c90d8d8ec33af192a87371369b4 +DIST emscripten-1.37.3.tar.gz 32194871 SHA256 2c5dd2dfe187a7660c650b783207335e8295f14291b95b1109b353e1bd991db1 SHA512 d31712a7490423251a773f19be55661d175a89391458292d7aaafb7f557fa8baad73ba7ed335d5da775a9ba29256329b5a5d5034929b7fae3d4dc83e3432e85c WHIRLPOOL 93080546061dc48409a708559180022c9d94023b804f17c17c33af94e9d135d8f43b8151af0b9709ec75005f26c2921601ecab9e4993c14303f9bd02c7f01ee8 diff --git a/dev-util/emscripten/emscripten-1.37.1.ebuild b/dev-util/emscripten/emscripten-1.37.1.ebuild deleted file mode 100644 index 76720ffb2..000000000 --- a/dev-util/emscripten/emscripten-1.37.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="LLVM-to-JavaScript Compiler" -HOMEPAGE="http://emscripten.org/" -SRC_URI="https://github.com/kripken/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="UoI-NCSA" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - ~dev-util/emscripten-fastcomp-${PV} - >=net-libs/nodejs-0.12.6" -RDEPEND="${DEPEND}" - -DEST="/usr/share/" -TEST="${WORKDIR}/test/" - -prepare_file() { - cp "${FILESDIR}/${1}" "${S}/" || die "could not copy '${1}'" - sed -i "s/\${PV}/${PV}/g" "${S}/${1}" || \ - die "could not adjust path for '${1}'" -} - -src_prepare() { - prepare_file "99emscripten" - prepare_file "emscripten.config" - eapply "${FILESDIR}/${PV}/emcc.patch" - eapply "${FILESDIR}/${PV}/emcmake.patch" - eapply_user -} - -src_test() { - mkdir "${TEST}" || die "Could not create test directory!" - cp "${FILESDIR}/hello_world.cpp" "${TEST}" || die "Could not copy example file" - cp "${S}/emscripten.config" "${TEST}" || die "Could not copy config file" - sed -i -e "/^EMSCRIPTEN_ROOT/s|/usr/share/|${S}|" \ - "${TEST}/emscripten.config" || die "Could not adjust path for testing" - export EM_CONFIG="${TEST}/emscripten.config" || die "Could not export variable" - ../"${P}/emcc" "${TEST}/hello_world.cpp" -o "${TEST}/hello_world.js" || \ - die "Error during executing emcc!" - test -f "${TEST}/hello_world.js" || die "Could not find '${TEST}/hello_world.js'" - OUT=$(/usr/bin/node "${TEST}/hello_world.js") || \ - die "Could not execute /usr/bin/node" - EXP=$(echo -e -n 'Hello World!\n') || die "Could not create expected string" - if [ "${OUT}" != "${EXP}" ]; then - die "Expected '${EXP}' but got '${OUT}'!" - fi - rm -r "${TEST}" || die "Could not clean-up '${TEST}'" -} - -src_install() { - dodir ${DEST}/${P} - cp -R "${S}/" "${D}/${DEST}" || die "Could not install files" - dosym ../share/${P}/emcc /usr/bin/emcc - dosym ../share/${P}/emcmake /usr/bin/emcmake - doenvd 99emscripten - ewarn "If you consider using emscripten in an active shell,"\ - "please execute 'source /etc/profile'" -} - -pkg_postinst() { - elog "Running emscripten initialization, may take a few seconds..." - export EM_CONFIG="${DEST}/${P}/emscripten.config" || die "Could not export variable" - /usr/bin/emcc -v || die "Could not run emcc initialization" -} diff --git a/dev-util/emscripten/emscripten-1.37.3.ebuild b/dev-util/emscripten/emscripten-1.37.3.ebuild new file mode 100644 index 000000000..51a451856 --- /dev/null +++ b/dev-util/emscripten/emscripten-1.37.3.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-single-r1 + +DESCRIPTION="LLVM-to-JavaScript Compiler" +HOMEPAGE="http://emscripten.org/" +SRC_URI="https://github.com/kripken/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="UoI-NCSA" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + ~dev-util/emscripten-fastcomp-${PV}" +RDEPEND="${DEPEND}" + +DEST="/usr/share/" +TEST="${WORKDIR}/test/" + +prepare_file() { + cp "${FILESDIR}/${1}" "${S}/" || die "could not copy '${1}'" + sed -i "s/\${PV}/${PV}/g" "${S}/${1}" || \ + die "could not adjust path for '${1}'" +} + +src_prepare() { + prepare_file "99emscripten" + prepare_file "emscripten.config" + eapply "${FILESDIR}/${PV}/emcc.patch" + eapply "${FILESDIR}/${PV}/emcmake.patch" + eapply_user +} + +src_test() { + mkdir "${TEST}" || die "Could not create test directory!" + cp "${FILESDIR}/hello_world.cpp" "${TEST}" || die "Could not copy example file" + cp "${S}/emscripten.config" "${TEST}" || die "Could not copy config file" + sed -i -e "/^EMSCRIPTEN_ROOT/s|/usr/share/|${S}|" \ + "${TEST}/emscripten.config" || die "Could not adjust path for testing" + export EM_CONFIG="${TEST}/emscripten.config" || die "Could not export variable" + ../"${P}/emcc" "${TEST}/hello_world.cpp" -o "${TEST}/hello_world.js" || \ + die "Error during executing emcc!" + test -f "${TEST}/hello_world.js" || die "Could not find '${TEST}/hello_world.js'" + OUT=$(/usr/bin/node "${TEST}/hello_world.js") || \ + die "Could not execute /usr/bin/node" + EXP=$(echo -e -n 'Hello World!\n') || die "Could not create expected string" + if [ "${OUT}" != "${EXP}" ]; then + die "Expected '${EXP}' but got '${OUT}'!" + fi + rm -r "${TEST}" || die "Could not clean-up '${TEST}'" +} + +src_install() { + dodir ${DEST}/${P} + cp -R "${S}/" "${D}/${DEST}" || die "Could not install files" + dosym ../share/${P}/emcc /usr/bin/emcc + dosym ../share/${P}/emcmake /usr/bin/emcmake + doenvd 99emscripten + ewarn "If you consider using emscripten in an active shell,"\ + "please execute 'source /etc/profile'" +} + +pkg_postinst() { + elog "Running emscripten initialization, may take a few seconds..." + export EM_CONFIG="${DEST}/${P}/emscripten.config" || die "Could not export variable" + /usr/bin/emcc -v || die "Could not run emcc initialization" +} diff --git a/dev-util/emscripten/files/1.37.1/emcc.patch b/dev-util/emscripten/files/1.37.1/emcc.patch deleted file mode 100644 index 49bf9fd0b..000000000 --- a/dev-util/emscripten/files/1.37.1/emcc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/emcc.orig 2016-05-13 02:59:24.977645718 +0200 -+++ b/emcc 2016-05-13 03:00:22.778643301 +0200 -@@ -4,6 +4,7 @@ - - - import sys -+import os - - - -@@ -14,4 +15,4 @@ - else: - import os, subprocess - if __name__ == '__main__': -- sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcc.py')] + sys.argv[1:])) -+ sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.environ['EM_CONFIG']), 'emcc.py')] + sys.argv[1:])) diff --git a/dev-util/emscripten/files/1.37.1/emcmake.patch b/dev-util/emscripten/files/1.37.1/emcmake.patch deleted file mode 100644 index 02ce70321..000000000 --- a/dev-util/emscripten/files/1.37.1/emcmake.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/emcmake.orig 2016-05-13 02:59:31.244645456 +0200 -+++ b/emcmake 2016-05-13 03:03:54.995634425 +0200 -@@ -4,6 +4,7 @@ - - - import sys -+import os - - - -@@ -14,4 +15,4 @@ - else: - import os, subprocess - if __name__ == '__main__': -- sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcmake.py')] + sys.argv[1:])) -+ sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.environ['EM_CONFIG']), 'emcmake.py')] + sys.argv[1:])) diff --git a/dev-util/emscripten/files/1.37.3/emcc.patch b/dev-util/emscripten/files/1.37.3/emcc.patch new file mode 100644 index 000000000..49bf9fd0b --- /dev/null +++ b/dev-util/emscripten/files/1.37.3/emcc.patch @@ -0,0 +1,16 @@ +--- a/emcc.orig 2016-05-13 02:59:24.977645718 +0200 ++++ b/emcc 2016-05-13 03:00:22.778643301 +0200 +@@ -4,6 +4,7 @@ + + + import sys ++import os + + + +@@ -14,4 +15,4 @@ + else: + import os, subprocess + if __name__ == '__main__': +- sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcc.py')] + sys.argv[1:])) ++ sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.environ['EM_CONFIG']), 'emcc.py')] + sys.argv[1:])) diff --git a/dev-util/emscripten/files/1.37.3/emcmake.patch b/dev-util/emscripten/files/1.37.3/emcmake.patch new file mode 100644 index 000000000..02ce70321 --- /dev/null +++ b/dev-util/emscripten/files/1.37.3/emcmake.patch @@ -0,0 +1,16 @@ +--- a/emcmake.orig 2016-05-13 02:59:31.244645456 +0200 ++++ b/emcmake 2016-05-13 03:03:54.995634425 +0200 +@@ -4,6 +4,7 @@ + + + import sys ++import os + + + +@@ -14,4 +15,4 @@ + else: + import os, subprocess + if __name__ == '__main__': +- sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcmake.py')] + sys.argv[1:])) ++ sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.environ['EM_CONFIG']), 'emcmake.py')] + sys.argv[1:])) -- cgit v1.2.3-65-gdbad