From 43ba16dcf99256afef7fdbe4182a35d2635bef62 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Fri, 3 Dec 2021 12:20:19 -0500 Subject: dev-util/binaryen: upgrade to 103 --- dev-util/binaryen/Manifest | 2 +- dev-util/binaryen/binaryen-102.ebuild | 35 ----------- dev-util/binaryen/binaryen-103.ebuild | 33 +++++++++++ .../binaryen-undo-compile-flag-braindamage.patch | 68 ---------------------- 4 files changed, 34 insertions(+), 104 deletions(-) delete mode 100644 dev-util/binaryen/binaryen-102.ebuild create mode 100644 dev-util/binaryen/binaryen-103.ebuild delete mode 100644 dev-util/binaryen/files/binaryen-undo-compile-flag-braindamage.patch diff --git a/dev-util/binaryen/Manifest b/dev-util/binaryen/Manifest index c08f9f0..cf6d7ab 100644 --- a/dev-util/binaryen/Manifest +++ b/dev-util/binaryen/Manifest @@ -1 +1 @@ -DIST binaryen-102.tar.gz 3901225 BLAKE2B 7b657c89dd8aedffd67c234fd5f198ab4ee2ee2a2b35376224e031b94e96b30a5e6abda3a227268a48b1f7d96e587240c4a4be0fb3d577ef121e39febddd46c2 SHA512 04ed9abca7469fc7f0d4b348e3fc6637585306b4c92683688f0ced50bc03a9f16ea7634daed45db96f7e543d9ac66440e17339187ba97b779a041a6032f7f279 +DIST binaryen-103.tar.gz 4019610 BLAKE2B 317cd751f105f1d188f2102222919152c6772b312a72f1e4bf217fc187e12dc38b6fae158e96412539e1314c94b9a74b080a4bf2379166e50a06c2778ae15a95 SHA512 57be126b33cd346e65ac41ac46c25b55853eb67890479fd4a006c62c2ba6e5e21f4939520719f2c16214c1675b9b19c7330014405c9aaf5c1953d83774184420 diff --git a/dev-util/binaryen/binaryen-102.ebuild b/dev-util/binaryen/binaryen-102.ebuild deleted file mode 100644 index b2e42e7..0000000 --- a/dev-util/binaryen/binaryen-102.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Compiler and toolchain infrastructure library for WebAssembly" -HOMEPAGE="https://github.com/WebAssembly/binaryen" -SRC_URI="https://github.com/WebAssembly/binaryen/archive/version_${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -# broken -RESTRICT="test" - -S="${WORKDIR}/binaryen-version_${PV}" - -PATCHES=(${FILESDIR}/binaryen-undo-compile-flag-braindamage.patch) - -src_configure() { - local mycmakeargs=( - -DENABLE_WERROR=no - -DBUILD_LLVM_DWARF=no - ) - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - "${S}/check.py" || die -} diff --git a/dev-util/binaryen/binaryen-103.ebuild b/dev-util/binaryen/binaryen-103.ebuild new file mode 100644 index 0000000..f2e64bb --- /dev/null +++ b/dev-util/binaryen/binaryen-103.ebuild @@ -0,0 +1,33 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Compiler and toolchain infrastructure library for WebAssembly" +HOMEPAGE="https://github.com/WebAssembly/binaryen" +SRC_URI="https://github.com/WebAssembly/binaryen/archive/version_${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +# broken +RESTRICT="test" + +S="${WORKDIR}/binaryen-version_${PV}" + +src_configure() { + local mycmakeargs=( + -DENABLE_WERROR=no + -DBUILD_LLVM_DWARF=no + ) + cmake_src_configure +} + +src_test() { + cd "${BUILD_DIR}" || die + "${S}/check.py" || die +} diff --git a/dev-util/binaryen/files/binaryen-undo-compile-flag-braindamage.patch b/dev-util/binaryen/files/binaryen-undo-compile-flag-braindamage.patch deleted file mode 100644 index 93a7b9a..0000000 --- a/dev-util/binaryen/files/binaryen-undo-compile-flag-braindamage.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -ru a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-04-16 14:09:26.000000000 -0400 -+++ b/CMakeLists.txt 2021-04-24 09:48:11.792348791 -0400 -@@ -137,17 +137,6 @@ - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY${SUFFIX} "${PROJECT_BINARY_DIR}/lib") - endforeach() - --option(BYN_ENABLE_LTO "Build with LTO" Off) --if(BYN_ENABLE_LTO) -- if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- message(FATAL_ERROR "ThinLTO is only supported by clang") -- endif() -- if(NOT APPLE) -- add_link_flag("-fuse-ld=lld") -- endif() -- add_compile_flag("-flto=thin") --endif() -- - if(MSVC) - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.0") # VS2013 and older explicitly need /arch:sse2 set, VS2015 no longer has that option, but always enabled. - add_compile_flag("/arch:sse2") -@@ -212,15 +201,6 @@ - set(CMAKE_THREAD_PREFER_PTHREAD ON) - find_package(Threads REQUIRED) - add_cxx_flag("-std=c++${CXX_STANDARD}") -- if(NOT EMSCRIPTEN) -- if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") -- # wasm doesn't allow for x87 floating point math -- add_compile_flag("-msse2") -- add_compile_flag("-mfpmath=sse") -- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^armv[2-6]" AND NOT CMAKE_CXX_FLAGS MATCHES "-mfpu=") -- add_compile_flag("-mfpu=vfpv3") -- endif() -- endif() - add_compile_flag("-Wall") - if(ENABLE_WERROR) - add_compile_flag("-Werror") -@@ -244,14 +224,6 @@ - elseif(NOT EMSCRIPTEN) - add_compile_flag("-fPIC") - endif() -- add_debug_compile_flag("-O0") -- add_debug_compile_flag("-g3") -- if(EMSCRIPTEN) -- # really focus on minimizing output size when compiling sources -- add_nondebug_compile_flag("-Oz") -- else() -- add_nondebug_compile_flag("-O2") -- endif() - if(BYN_ENABLE_ASSERTIONS) - # On non-Debug builds cmake automatically defines NDEBUG, so we - # explicitly undefine it: -@@ -273,15 +245,6 @@ - add_nondebug_compile_flag("-flto") - endif() - --# clang doesn't print colored diagnostics when invoked from Ninja --if(UNIX AND CMAKE_GENERATOR STREQUAL "Ninja") -- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -- add_compile_flag("-fdiagnostics-color=always") -- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -- add_compile_flag("-fcolor-diagnostics") -- endif() --endif() -- - # Static libraries - # Current (partial) dependency structure is as follows: - # passes -> wasm -> asmjs -> support -- cgit v1.2.3-54-g00ecf