* [gentoo-commits] proj/musl:master commit in: sys-libs/libcxxabi/, sys-libs/libomp/, sys-libs/libcxx/, sys-libs/libomp/files/, ...
@ 2019-10-20 1:20 Jory Pratt
0 siblings, 0 replies; only message in thread
From: Jory Pratt @ 2019-10-20 1:20 UTC (permalink / raw
To: gentoo-commits
commit: a94baadf48ea955acd0cda6769ab8cedfa00cda8
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sat Oct 19 09:09:03 2019 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 01:20:31 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a94baadf
sys-libs/libcxx{abi} and sys-libs/libomp: drop old v4.0.1
there's no consumer anymore
Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-libs/libcxx/Manifest | 1 -
.../0001-check-for-musl-libcs-max_align_t.patch | 26 ---
.../libcxx/files/libcxx-3.9-cmake-link-flags.patch | 23 ---
sys-libs/libcxx/libcxx-4.0.1.ebuild | 200 ---------------------
sys-libs/libcxx/metadata.xml | 21 ---
sys-libs/libcxxabi/Manifest | 2 -
.../0001-check-for-musl-libcs-max_align_t.patch | 26 ---
sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild | 97 ----------
sys-libs/libcxxabi/metadata.xml | 10 --
sys-libs/libomp/Manifest | 1 -
...-link-latomic-to-provide-atomics-when-ava.patch | 94 ----------
.../files/libomp-4.0.0-use-va_copy-macro.patch | 12 --
sys-libs/libomp/libomp-4.0.1.ebuild | 80 ---------
sys-libs/libomp/metadata.xml | 16 --
14 files changed, 609 deletions(-)
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
deleted file mode 100644
index 842399f..0000000
--- a/sys-libs/libcxx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libcxx-4.0.1.src.tar.xz 1446380 SHA256 520a1171f272c9ff82f324d5d89accadcec9bc9f3c78de11f5575cdb99accc4c SHA512 91f3f397be606989be99865d0b279557f9afb93f7a74ed10c3a74f4440e38b5694ddf452bbf2f487cacd4391606dd5c7edfe5130f2de19e2acfd6cce619d028a WHIRLPOOL fe7c71e8dc2d17d14e94896837229c5ed872e7c04aea79a207e8fa98aa4539a7445e402b848d0c0d009f154f00d970159ad009d16bfdb9ae012ce5c7c6d9ba51
diff --git a/sys-libs/libcxx/files/0001-check-for-musl-libcs-max_align_t.patch b/sys-libs/libcxx/files/0001-check-for-musl-libcs-max_align_t.patch
deleted file mode 100644
index d1094c9..0000000
--- a/sys-libs/libcxx/files/0001-check-for-musl-libcs-max_align_t.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7a72799513088762bef49b55438f3c42acc50ab2 Mon Sep 17 00:00:00 2001
-From:
-Date: Fri, 23 Jun 2017 22:27:04 -0500
-Subject: [PATCH] check-for-musl-libcs-max_align_t
-
----
- include/stddef.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/stddef.h b/include/stddef.h
-index 8841bbe..faf8552 100644
---- a/include/stddef.h
-+++ b/include/stddef.h
-@@ -53,7 +53,8 @@ using std::nullptr_t;
- }
-
- // Re-use the compiler's <stddef.h> max_align_t where possible.
--#if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T)
-+#if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T) && \
-+ !defined(__DEFINED_max_align_t)
- typedef long double max_align_t;
- #endif
-
---
-2.13.1
-
diff --git a/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch b/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch
deleted file mode 100644
index bef5bc1..0000000
--- a/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d618e83..0e76525 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -293,6 +293,18 @@ remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG
- # so they don't get transformed into -Wno and -errors respectivly.
- remove_flags(-Wno-pedantic -pedantic-errors -pedantic)
-
-+# FIXME: this is cribbed from HandleLLVMOptions.cmake.
-+if(LIBCXX_STANDALONE_BUILD)
-+ # Pass -Wl,-z,defs. This makes sure all symbols are defined. Otherwise a DSO
-+ # build might work on ELF but fail on MachO/COFF.
-+ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR
-+ ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
-+ ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND
-+ NOT LLVM_USE_SANITIZER)
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
-+ endif()
-+endif()
-+
- # Required flags ==============================================================
- add_compile_flags_if_supported(-std=c++11)
- if (NOT MSVC AND NOT LIBCXX_SUPPORTS_STD_EQ_CXX11_FLAG)
diff --git a/sys-libs/libcxx/libcxx-4.0.1.ebuild b/sys-libs/libcxx/libcxx-4.0.1.ebuild
deleted file mode 100644
index 5c87adc..0000000
--- a/sys-libs/libcxx/libcxx-4.0.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Ninja provides better scalability and cleaner verbose output, and is used
-# throughout all LLVM projects.
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib llvm python-any-r1 toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-SRC_URI="http://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
-REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
- ?? ( libcxxabi libcxxrt )"
-
-RDEPEND="
- libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
- libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
- !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )"
-# LLVM 4 required for llvm-config --cmakedir
-# clang-3.9.0 installs necessary target symlinks unconditionally
-# which removes the need for MULTILIB_USEDEP
-DEPEND="${RDEPEND}
- test? ( >=sys-devel/clang-3.9.0
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
- app-arch/xz-utils
- >=sys-devel/llvm-4"
-
-S=${WORKDIR}/${P/_/}.src
-
-DOCS=( CREDITS.TXT )
-
-PATCHES=(
- # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
- # out-of-tree build.
- "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
- "${FILESDIR}/0001-check-for-musl-libcs-max_align_t.patch"
-)
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
- has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- llvm_pkg_setup
- use test && python-any-r1_pkg_setup
-
- if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
- eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
- eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
- eerror "and try again."
- die
- fi
- if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then
- eerror "${PN} needs to be built with gcc-4.7 or later (or other"
- eerror "conformant compilers). Please use gcc-config to switch to"
- eerror "gcc-4.7 or later version."
- die
- fi
-}
-
-multilib_src_configure() {
- local cxxabi cxxabi_incs
- if use libcxxabi; then
- cxxabi=libcxxabi
- cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
- elif use libcxxrt; then
- cxxabi=libcxxrt
- cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
- else
- local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
- cxxabi=libsupc++
- cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
- fi
-
- # we want -lgcc_s for unwinder, and for compiler runtime when using
- # gcc, clang with gcc runtime (or any unknown compiler)
- local extra_libs=() want_gcc_s=ON
- if use libunwind; then
- # work-around missing -lunwind upstream
- extra_libs+=( -lunwind )
- # if we're using libunwind and clang with compiler-rt, we want
- # to link to compiler-rt instead of -lgcc_s
- if tc-is-clang; then
- # get the full library list out of 'pretend mode'
- # and grep it for libclang_rt references
- local args=( $($(tc-getCC) -### -x c - 2>&1 | tail -n 1) )
- local i
- for i in "${args[@]}"; do
- if [[ ${i} == *libclang_rt* ]]; then
- want_gcc_s=OFF
- extra_libs+=( "${i}" )
- fi
- done
- fi
- fi
-
- local libdir=$(get_libdir)
- local mycmakeargs=(
- -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
- -DLIBCXX_ENABLE_SHARED=ON
- -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
- -DLIBCXX_CXX_ABI=${cxxabi}
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
- # we're using our own mechanism for generating linker scripts
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
- -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
- -DLIBCXX_INCLUDE_TESTS=$(usex test)
- -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
- )
-
- if use test; then
- mycmakeargs+=(
- # this can be any directory, it just needs to exist...
- # FIXME: remove this once https://reviews.llvm.org/D25093 is merged
- -DLLVM_MAIN_SRC_DIR="${T}"
- -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
- )
- fi
- cmake-utils_src_configure
-}
-
-multilib_src_test() {
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
- sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die
-
- cmake-utils_src_make check-libcxx
-}
-
-# Usage: deps
-gen_ldscript() {
- local output_format
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
- cat <<-END_LDSCRIPT
-/* GNU ld script
- Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
- local libdir=$(get_libdir)
- local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
-
- # Move it first.
- mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
- # Generate libc++.a ldscript for inclusion of its dependencies so that
- # clang++ -stdlib=libc++ -static works out of the box.
- local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
- # On Linux/glibc it does not link without libpthread or libdl. It is
- # fine on FreeBSD.
- use elibc_glibc && deps+=" libpthread.a libdl.a"
-
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
-}
-
-gen_shared_ldscript() {
- local libdir=$(get_libdir)
- # libsupc++ doesn't have a shared version
- local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
-
- mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
- local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
-
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
-}
-
-multilib_src_install() {
- cmake-utils_src_install
- gen_shared_ldscript
- use static-libs && gen_static_ldscript
-}
-
-pkg_postinst() {
- elog "This package (${PN}) is mainly intended as a replacement for the C++"
- elog "standard library when using clang."
- elog "To use it, instead of libstdc++, use:"
- elog " clang++ -stdlib=libc++"
- elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml
deleted file mode 100644
index df0c52d..0000000
--- a/sys-libs/libcxx/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>aballier@gentoo.org</email>
- <name>Alexis Ballier</name>
- </maintainer>
- <maintainer type="project">
- <email>bsd@gentoo.org</email>
- <name>BSD Project</name>
- </maintainer>
- <maintainer type="project">
- <email>llvm@gentoo.org</email>
- <name>LLVM Project</name>
- </maintainer>
- <use>
- <flag name="libcxxabi">Build on top of <pkg>sys-libs/libcxxabi</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
- <flag name="libcxxrt">Build on top of <pkg>sys-libs/libcxxrt</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
- <flag name="libunwind">Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependence on gcc.</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
deleted file mode 100644
index 41a535b..0000000
--- a/sys-libs/libcxxabi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libcxx-4.0.1.src.tar.xz 1446380 SHA256 520a1171f272c9ff82f324d5d89accadcec9bc9f3c78de11f5575cdb99accc4c SHA512 91f3f397be606989be99865d0b279557f9afb93f7a74ed10c3a74f4440e38b5694ddf452bbf2f487cacd4391606dd5c7edfe5130f2de19e2acfd6cce619d028a WHIRLPOOL fe7c71e8dc2d17d14e94896837229c5ed872e7c04aea79a207e8fa98aa4539a7445e402b848d0c0d009f154f00d970159ad009d16bfdb9ae012ce5c7c6d9ba51
-DIST libcxxabi-4.0.1.src.tar.xz 515820 SHA256 8f08178989a06c66cd19e771ff9d8ca526dd4a23d1382d63e416c04ea9fa1b33 SHA512 e94315ba8a507d8481d70c33e7ab2d724d51726edb8412c70a1b5f59e3f15d5825f1502dc2db138b20e5293fb90a184050be94d5ac270fd7ce78b502efb9f86a WHIRLPOOL 8771bb1f5ac8cb1d22a4606bfd3b448e1e3b942be0d5639a7c8c36abcc550a59cf2e530558aeb486294b642fdcd10c56695b59d094bed41e0115980cb587c8af
diff --git a/sys-libs/libcxxabi/files/0001-check-for-musl-libcs-max_align_t.patch b/sys-libs/libcxxabi/files/0001-check-for-musl-libcs-max_align_t.patch
deleted file mode 100644
index d1094c9..0000000
--- a/sys-libs/libcxxabi/files/0001-check-for-musl-libcs-max_align_t.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7a72799513088762bef49b55438f3c42acc50ab2 Mon Sep 17 00:00:00 2001
-From:
-Date: Fri, 23 Jun 2017 22:27:04 -0500
-Subject: [PATCH] check-for-musl-libcs-max_align_t
-
----
- include/stddef.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/stddef.h b/include/stddef.h
-index 8841bbe..faf8552 100644
---- a/include/stddef.h
-+++ b/include/stddef.h
-@@ -53,7 +53,8 @@ using std::nullptr_t;
- }
-
- // Re-use the compiler's <stddef.h> max_align_t where possible.
--#if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T)
-+#if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T) && \
-+ !defined(__DEFINED_max_align_t)
- typedef long double max_align_t;
- #endif
-
---
-2.13.1
-
diff --git a/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
deleted file mode 100644
index 77811db..0000000
--- a/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib llvm python-any-r1
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="http://libcxxabi.llvm.org/"
-SRC_URI="http://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
- http://releases.llvm.org/${PV/_//}/libcxx-${PV/_/}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+libunwind +static-libs test"
-
-RDEPEND="
- libunwind? (
- || (
- >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
- >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
- )
- )"
-# LLVM 4 required for llvm-config --cmakedir
-DEPEND="${RDEPEND}
- >=sys-devel/llvm-4
- test? ( >=sys-devel/clang-3.9.0
- ~sys-libs/libcxx-${PV}[libcxxabi(-)]
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-S=${WORKDIR}/${P/_/}.src
-S1=${WORKDIR}/libcxx
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
- has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- llvm_pkg_setup
- use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
- default
-
- mv libcxx-* libcxx || die
- cd ${S1}
- eapply "${FILESDIR}"/0001-check-for-musl-libcs-max_align_t.patch
-}
-
-multilib_src_configure() {
- local libdir=$(get_libdir)
- local mycmakeargs=(
- -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
- -DLIBCXXABI_ENABLE_SHARED=ON
- -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
- -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
- -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
- # upstream is omitting standard search path for this
- # probably because gcc & clang are bundling their own unwind.h
- -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
- # this only needs to exist, it does not have to make sense
- # FIXME: remove this once https://reviews.llvm.org/D25314 is merged
- -DLIBCXXABI_LIBUNWIND_SOURCES="${T}"
- )
- if use test; then
- mycmakeargs+=(
- -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
- )
- fi
- cmake-utils_src_configure
-}
-
-multilib_src_test() {
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
- sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die
-
- cmake-utils_src_make check-libcxxabi
-}
-
-multilib_src_install_all() {
- insinto /usr/include/libcxxabi
- doins -r include/.
-}
diff --git a/sys-libs/libcxxabi/metadata.xml b/sys-libs/libcxxabi/metadata.xml
deleted file mode 100644
index 78c7d7d..0000000
--- a/sys-libs/libcxxabi/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>llvm@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="libunwind">Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependency on gcc</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
deleted file mode 100644
index a4ee5e0..0000000
--- a/sys-libs/libomp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openmp-4.0.1.src.tar.xz 2275240 BLAKE2B e63cf670c4cd2678afc4d7b96be85c3d157bf91a69510f980d9a0a07f61b449b22ff28d63753f32e63afedb4a7077c662a633f689a660b5047a83bcf1fb7f009 SHA512 0b737dde832c5907a0cac41fe1d594b61e85dd405eee42b39f09233db62b44543204ccc775e52e2981f9c9f0683b234526e288a3a7a04f712280fb3a575abcaf
diff --git a/sys-libs/libomp/files/4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch b/sys-libs/libomp/files/4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch
deleted file mode 100644
index 6881755..0000000
--- a/sys-libs/libomp/files/4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 7bd70635240f69fcd4da4d98a4aca8aaa779dd11 Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Fri, 24 Feb 2017 22:15:24 +0000
-Subject: [PATCH] [test] Try to link -latomic to provide atomics when available
-
-When using -rtlib=libgcc, the fallback implementation of __atomic_*
-builtins is provided via libatomic (included in GCC). However, neither
-GCC itself nor clang link libatomic implicitly, and it seems that GCC
-upstream expects projects to link it explicitly as necessary.
-
-Since compiler-rt provides __atomic_* builtins directly in the main
-library, check if they are provided by the default libraries first.
-If they are not, check if -latomic is available to provide them
-and add explicit -latomic for tests in this case.
-
-This fixes unresolved __atomic_load() references when running openmp
-tests on i386 with libgcc backend.
-
-Differential Revision: https://reviews.llvm.org/D30083
-
-git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@296183 91177308-0d34-0410-b5e6-96231b3b80d8
----
- runtime/test/CMakeLists.txt | 13 +++++++++++++
- runtime/test/lit.cfg | 2 ++
- runtime/test/lit.site.cfg.in | 2 +-
- 3 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/runtime/test/CMakeLists.txt b/runtime/test/CMakeLists.txt
-index 8162855..88c02c8 100644
---- a/runtime/test/CMakeLists.txt
-+++ b/runtime/test/CMakeLists.txt
-@@ -1,6 +1,7 @@
- # CMakeLists.txt file for unit testing OpenMP Library
- include(FindPythonInterp)
- include(CheckTypeSize)
-+include(CheckFunctionExists)
- include(CheckLibraryExists)
-
- if(NOT PYTHONINTERP_FOUND)
-@@ -11,6 +12,17 @@ endif()
-
- # Some tests use math functions
- check_library_exists(m sqrt "" LIBOMP_HAVE_LIBM)
-+# When using libgcc, -latomic may be needed for atomics
-+# (but when using compiler-rt, the atomics will be built-in)
-+# Note: we can not check for __atomic_load because clang treats it
-+# as special built-in and that breaks CMake checks
-+check_function_exists(__atomic_load_1 LIBOMP_HAVE_BUILTIN_ATOMIC)
-+if(NOT LIBOMP_HAVE_BUILTIN_ATOMIC)
-+ check_library_exists(atomic __atomic_load_1 "" LIBOMP_HAVE_LIBATOMIC)
-+else()
-+ # not needed
-+ set(LIBOMP_HAVE_LIBATOMIC 0)
-+endif()
-
- macro(pythonize_bool var)
- if (${var})
-@@ -25,6 +37,7 @@ pythonize_bool(LIBOMP_OMPT_SUPPORT)
- pythonize_bool(LIBOMP_OMPT_BLAME)
- pythonize_bool(LIBOMP_OMPT_TRACE)
- pythonize_bool(LIBOMP_HAVE_LIBM)
-+pythonize_bool(LIBOMP_HAVE_LIBATOMIC)
-
- set(LIBOMP_TEST_CFLAGS "" CACHE STRING
- "Extra compiler flags to send to the test compiler")
-diff --git a/runtime/test/lit.cfg b/runtime/test/lit.cfg
-index 7f18da4..bef61d4 100644
---- a/runtime/test/lit.cfg
-+++ b/runtime/test/lit.cfg
-@@ -52,6 +52,8 @@ config.test_cflags = config.test_openmp_flag + \
- libs = ""
- if config.has_libm:
- libs += " -lm"
-+if config.has_libatomic:
-+ libs += " -latomic"
-
- # Allow XFAIL to work
- config.target_triple = [ ]
-diff --git a/runtime/test/lit.site.cfg.in b/runtime/test/lit.site.cfg.in
-index 448132e..b0d57ce 100644
---- a/runtime/test/lit.site.cfg.in
-+++ b/runtime/test/lit.site.cfg.in
-@@ -12,7 +12,7 @@ config.hwloc_library_dir = "@LIBOMP_HWLOC_LIBRARY_DIR@"
- config.using_hwloc = @LIBOMP_USE_HWLOC@
- config.has_ompt = @LIBOMP_OMPT_SUPPORT@ and @LIBOMP_OMPT_BLAME@ and @LIBOMP_OMPT_TRACE@
- config.has_libm = @LIBOMP_HAVE_LIBM@
-+config.has_libatomic = @LIBOMP_HAVE_LIBATOMIC@
-
- # Let the main config do the real work.
- lit_config.load_config(config, "@LIBOMP_BASE_DIR@/test/lit.cfg")
--
---
-2.12.0
-
diff --git a/sys-libs/libomp/files/libomp-4.0.0-use-va_copy-macro.patch b/sys-libs/libomp/files/libomp-4.0.0-use-va_copy-macro.patch
deleted file mode 100644
index 6d8cc9b..0000000
--- a/sys-libs/libomp/files/libomp-4.0.0-use-va_copy-macro.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur openmp-4.0.0.src.orig/runtime/src/kmp_str.cpp openmp-4.0.0.src/runtime/src/kmp_str.cpp
---- openmp-4.0.0.src.orig/runtime/src/kmp_str.cpp 2017-03-13 16:59:41.294879402 -0700
-+++ openmp-4.0.0.src/runtime/src/kmp_str.cpp 2017-03-13 17:00:40.521420835 -0700
-@@ -208,7 +208,7 @@
-
- #if ! KMP_OS_WINDOWS
- va_list _args;
-- __va_copy( _args, args ); // Make copy of args.
-+ va_copy( _args, args ); // Make copy of args.
- #define args _args // Substitute args with its copy, _args.
- #endif // KMP_OS_WINDOWS
- rc = KMP_VSNPRINTF( buffer->str + buffer->used, free, format, args );
diff --git a/sys-libs/libomp/libomp-4.0.1.ebuild b/sys-libs/libomp/libomp-4.0.1.ebuild
deleted file mode 100644
index 820d8c9..0000000
--- a/sys-libs/libomp/libomp-4.0.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
-
-# Additional licenses:
-# - MIT-licensed Intel code,
-# - LLVM Software Grant from Intel.
-
-LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hwloc ompt test"
-
-RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="${RDEPEND}
- dev-lang/perl
- test? (
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
- sys-devel/llvm
- >=sys-devel/clang-3.9.0
- )"
-
-S=${WORKDIR}/openmp-${PV/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
- has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # fix atomic tests with gcc
- eapply "${FILESDIR}"/4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch
- eapply "${FILESDIR}"/${PN}-4.0.0-use-va_copy-macro.patch
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local libdir="$(get_libdir)"
- local mycmakeargs=(
- -DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}"
- -DLIBOMP_USE_HWLOC=$(usex hwloc)
- -DLIBOMP_OMPT_SUPPORT=$(usex ompt)
- # do not install libgomp.so & libiomp5.so aliases
- -DLIBOMP_INSTALL_ALIASES=OFF
- # disable unnecessary hack copying stuff back to srcdir
- -DLIBOMP_COPY_EXPORTS=OFF
- -DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")"
- )
- cmake-utils_src_configure
-}
-
-multilib_src_test() {
- # respect TMPDIR!
- local -x LIT_PRESERVES_TMP=1
-
- cmake-utils_src_make check-libomp
-}
diff --git a/sys-libs/libomp/metadata.xml b/sys-libs/libomp/metadata.xml
deleted file mode 100644
index ca91e84..0000000
--- a/sys-libs/libomp/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>voyageur@gentoo.org</email>
- <name>Bernard Cafarelli</name>
- </maintainer>
- <maintainer type="project">
- <email>llvm@gentoo.org</email>
- </maintainer>
- <use>
- <flag name='hwloc'>Enable CPU affinity support via hwloc</flag>
- <flag name='ompt'>Enable OpenMP Tools Interface support</flag>
- </use>
- <longdescription>The OpenMP subproject of LLVM is intended to contain all of the components required to build an executing OpenMP program that are outside the compiler itself.</longdescription>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-10-20 1:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-20 1:20 [gentoo-commits] proj/musl:master commit in: sys-libs/libcxxabi/, sys-libs/libomp/, sys-libs/libcxx/, sys-libs/libomp/files/, Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox