From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- dev-lang/zig/Manifest | 4 +- .../zig/files/zig-0.4.0-r1-build-artifacts.patch | 61 ++++++++++++++++++++++ .../zig/files/zig-0.4.0-r1-suppress-warnings.patch | 31 +++++++++++ dev-lang/zig/zig-0.4.0-r1.ebuild | 49 +++++++++++++++++ dev-lang/zig/zig-0.4.0.ebuild | 56 -------------------- 5 files changed, 144 insertions(+), 57 deletions(-) create mode 100644 dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch create mode 100644 dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch create mode 100644 dev-lang/zig/zig-0.4.0-r1.ebuild delete mode 100644 dev-lang/zig/zig-0.4.0.ebuild (limited to 'dev-lang/zig') diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest index 839c3c9c1d76..8f552173cf5a 100644 --- a/dev-lang/zig/Manifest +++ b/dev-lang/zig/Manifest @@ -1,3 +1,5 @@ +AUX zig-0.4.0-r1-build-artifacts.patch 2149 BLAKE2B 7d2ac6a9d3cca4a13a4ad932f71d892b18e02e12387593f70ceab87b4ca66faf74bd1f2841ed89adbb4e1e69fe2ccb9fce2071ddcf39e4761aee248d853029f3 SHA512 5a7475eb72d32889db55f5e89a18ce25647ec7e43a716ab2606875fb77e806c05134ee2a482fcc63e152f459d2065635ae9fb75d9228c216b3541d363fd30961 +AUX zig-0.4.0-r1-suppress-warnings.patch 1106 BLAKE2B 3e4cac7325789a3ef954f35814a63e554710afd00d5d913c1ae597913df05409e475cea652b4219f7cf1a8c0233391cf4bd82fec19f98552f66df5dddbb5d4ae SHA512 a401c6c88ab3b1f8e5344502a53b9c2157ff310625735b54d9e91bbc4c726fc5e97ea3a1678cbe1fe6bf7ce3087f6ef68778900c40fb633daee96f2bdef3dc2f DIST zig-0.4.0.tar.gz 8924757 BLAKE2B 5ca3377f205694ff02360900b49eee7347cdf1cdaef90f1be071eff2610425ed453dfb35928fbe65b25f151b7153ab838c887d362ed3cd746f07833ae42510fd SHA512 423915730bc4ae9a67db3731a96471467826d16e59b87b3541f3e8ed2436f941939f22ccbebdb9a958a195b05360eb65f5be1658b32a01cc8db55c6e581eb039 -EBUILD zig-0.4.0.ebuild 1544 BLAKE2B 2a9d70f9cd671727bbe6f57b0687fb4aeb747e5414f2f7b906694bfe7e69b77a084288667f75f364c64c8eca316c4d09e37f6f0dc31c815eea6cae04c9377753 SHA512 543d71bf430cb020ef4cacea6bcaf5298d02f7acf3449b87aeed2d9158ab8899dd16ee0281566829f0aaca4b29b1074353c492b357d4d5919acc819649ca1a0c +EBUILD zig-0.4.0-r1.ebuild 1250 BLAKE2B 43219ec7395eb7bb27a1d039c97773e76bb0d3b19656b692b804ad5bd991200b89bfd0af7c4b9bdc56f93886533243f3d0cbc411b2d5ce34f63906712a498665 SHA512 d61ca59a5205c8bdcf113ee0f317763808073b9e1480c551b1a71b34fa4e0bc3dc191e8961fdeb0b1ebe283b6f504c9403ca2c138f8afabbbf9200a7729e56f1 MISC metadata.xml 549 BLAKE2B 1f79da87db9888bc7a1c12163f7ee36dcb37645f5bdeb61034144f76b03b7e464c05f62a8753b0b85fd0ed4fd33ea1066da552d29d28bdd2502918697b3d94a0 SHA512 5867cda8d47f181e93b4aa4763efa5e12d7a6bbf1001e496cd82cc892a43b144a2d8a0a4d26466ac171622acf3590866d9d75a16c8337ae06734d5d4f8b2e908 diff --git a/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch b/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch new file mode 100644 index 000000000000..11868e93a8a4 --- /dev/null +++ b/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch @@ -0,0 +1,61 @@ +From 81767a658d07219a402384f98a7553abcbbd2e70 Mon Sep 17 00:00:00 2001 +From: Marc Tiehuis +Date: Thu, 18 Apr 2019 18:58:12 +1200 +Subject: [PATCH] Don't install stage2 artifacts + +Fixes #2220. +--- + CMakeLists.txt | 11 ++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1b017a881..047d538e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,16 @@ endif() + + set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp") + ++# Handle multi-config builds and place each into a common lib. The VS generator ++# for example will append a Debug folder by default if not explicitly specified. ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR}) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR}) ++foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES}) ++ string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE) ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR}) ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR}) ++endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES) ++ + if(ZIG_FORCE_EXTERNAL_LLD) + find_package(lld) + include_directories(${LLVM_INCLUDE_DIRS}) +@@ -253,7 +263,6 @@ else() + embedded_lld_wasm + embedded_lld_lib + ) +- install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}") + endif() + + # No patches have been applied to SoftFloat-3e + +From 40fe6afdad1a8676b5d3a5dd23d6d50d6ea9f059 Mon Sep 17 00:00:00 2001 +From: Marc Tiehuis +Date: Wed, 1 May 2019 17:39:23 +1200 +Subject: [PATCH] Don't install zig_cpp lib for stage2 target + +Missed in last commit. See #2220. +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 047d538e8..9881ce1de 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6671,6 +6681,5 @@ + endif() + install(TARGETS zig DESTINATION bin) +-install(TARGETS zig_cpp DESTINATION "${ZIG_CPP_LIB_DIR}") + + foreach(file ${ZIG_C_HEADER_FILES}) + get_filename_component(file_dir "${C_HEADERS_DEST}/${file}" DIRECTORY) diff --git a/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch b/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch new file mode 100644 index 000000000000..1dc92f88ecb2 --- /dev/null +++ b/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch @@ -0,0 +1,31 @@ +Don't attempt to look for static libraries that we're not going to use. +The warnings are only triggered when building with portage. + +--- a/cmake/Findllvm.cmake ++++ b/cmake/Findllvm.cmake +@@ -50,25 +50,6 @@ + endif() + endfunction(NEED_TARGET) + +-if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC) +- execute_process( +- COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static +- OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- string(REPLACE " " ";" LLVM_LIBRARIES "${LLVM_LIBRARIES_SPACES}") +- +- execute_process( +- COMMAND ${LLVM_CONFIG_EXE} --system-libs --link-static +- OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_SPACES +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- string(REPLACE " " ";" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_SPACES}") +- +- execute_process( +- COMMAND ${LLVM_CONFIG_EXE} --libdir --link-static +- OUTPUT_VARIABLE LLVM_LIBDIRS_SPACES +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- string(REPLACE " " ";" LLVM_LIBDIRS "${LLVM_LIBDIRS_SPACES}") +-endif() + if(NOT LLVM_LIBRARIES) + execute_process( + COMMAND ${LLVM_CONFIG_EXE} --libs diff --git a/dev-lang/zig/zig-0.4.0-r1.ebuild b/dev-lang/zig/zig-0.4.0-r1.ebuild new file mode 100644 index 000000000000..bedd9d7ba9b7 --- /dev/null +++ b/dev-lang/zig/zig-0.4.0-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils llvm + +DESCRIPTION="A robust, optimal, and maintainable programming language" +HOMEPAGE="https://ziglang.org/" +LICENSE="MIT" +SLOT="0" +IUSE="+experimental" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/ziglang/zig.git" + inherit git-r3 +else + SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX + PowerPC Sparc SystemZ WebAssembly X86 XCore ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) +# According to zig's author, zig builds that do not support all targets are not +# supported by the upstream project. +LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]} + +RDEPEND=" + sys-devel/llvm:8 + !experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] ) +" + +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/zig-0.4.0-r1-build-artifacts.patch" + "${FILESDIR}/zig-0.4.0-r1-suppress-warnings.patch" +) + +LLVM_MAX_SLOT=8 + +src_prepare() { + if use experimental; then + sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake" + fi + + cmake-utils_src_prepare +} diff --git a/dev-lang/zig/zig-0.4.0.ebuild b/dev-lang/zig/zig-0.4.0.ebuild deleted file mode 100644 index 606e696a4c59..000000000000 --- a/dev-lang/zig/zig-0.4.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="A robust, optimal, and maintainable programming language" -HOMEPAGE="https://ziglang.org/" -LICENSE="MIT" -SLOT="0" -IUSE="+experimental" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ziglang/zig.git" - inherit git-r3 -else - SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX - PowerPC Sparc SystemZ WebAssembly X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -# According to zig's author, zig builds that do not support all targets are not -# supported by the upstream project. -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]} - -RDEPEND=" - sys-devel/llvm:8 - !experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] ) -" - -DEPEND="${RDEPEND}" - -src_prepare() { - if use experimental; then - sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake" - fi - - sed -i '/^install(TARGETS zig_cpp/d' CMakeLists.txt || die "unable to modify CMakeLists.txt" - sed -i '/install(TARGETS embedded/d' CMakeLists.txt || die "unable to modify CMakeLists.txt" - - # Suppress error messages - sed -i '/if(NOT(CMAKE_BUILD_TYPE/,/endif()/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake" - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - ) - - cmake-utils_src_configure -} -- cgit v1.2.3