From c903f542fed462936cdd3d036ee60cdd183e2068 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Mon, 5 Apr 2021 01:54:27 +0000 Subject: Adding metadata --- dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild | 74 --------------------- dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild | 77 ++++++++++++++++++++++ .../files/abseil-cpp-20210324-pkgconfig_path.patch | 11 ++++ 3 files changed, 88 insertions(+), 74 deletions(-) delete mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild create mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild create mode 100644 dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch (limited to 'dev-cpp/abseil-cpp') diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild deleted file mode 100644 index 76584ee76a1b..000000000000 --- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit cmake python-any-r1 toolchain-funcs - -# yes, it needs SOURCE, not just installed one -GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e" -GTEST_FILE="gtest-1.10.0_p20200702.tar.gz" - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE}" - -LICENSE=" - Apache-2.0 - test? ( BSD ) -" -SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="+cxx17 test" - -DEPEND="" -RDEPEND="${DEPEND}" - -BDEPEND=" - ${PYTHON_DEPS} - test? ( sys-libs/timezone-data ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-20200923-arm_no_crypto.patch" -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die - - sed -i 's/-Werror//g' \ - "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die -} - -src_configure() { - if use arm || use arm64; then - if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then - append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO - fi - fi - - local mycmakeargs=( - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" - $(usex cxx17 -DCMAKE_CXX_STANDARD=17 '') # it has to be a useflag for some consumers - $(usex test -DBUILD_TESTING=ON '') #intentional usex - ) - cmake_src_configure -} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild new file mode 100644 index 000000000000..dfac84cf0865 --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild @@ -0,0 +1,77 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit cmake python-any-r1 toolchain-funcs + +# yes, it needs SOURCE, not just installed one +GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e" +GTEST_FILE="gtest-1.10.0_p20200702.tar.gz" + +DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" +HOMEPAGE="https://abseil.io" +SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" + +LICENSE=" + Apache-2.0 + test? ( BSD ) +" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="+cxx17 test" + +DEPEND="" +RDEPEND="${DEPEND}" + +BDEPEND=" + ${PYTHON_DEPS} + test? ( sys-libs/timezone-data ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-20200923-arm_no_crypto.patch" + "${FILESDIR}/${PN}-20210324-pkgconfig_path.patch" +) + +src_prepare() { + cmake_src_prepare + + # un-hardcode abseil compiler flags + sed -i \ + -e '/"-maes",/d' \ + -e '/"-msse4.1",/d' \ + -e '/"-mfpu=neon"/d' \ + -e '/"-march=armv8-a+crypto"/d' \ + absl/copts/copts.py || die + + # now generate cmake files + python_fix_shebang absl/copts/generate_copts.py + absl/copts/generate_copts.py || die + + if use test; then + sed -i 's/-Werror//g' \ + "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die + fi +} + +src_configure() { + if use arm || use arm64; then + if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then + append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO + fi + fi + + local mycmakeargs=( + -DABSL_ENABLE_INSTALL=TRUE + -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" + $(usex cxx17 -DCMAKE_CXX_STANDARD=17 '') # it has to be a useflag for some consumers + $(usex test -DBUILD_TESTING=ON '') #intentional usex + ) + cmake_src_configure +} diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch new file mode 100644 index 000000000000..3ce0a0cefe07 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch @@ -0,0 +1,11 @@ +--- /CMake/AbseilHelpers.cmake ++++ /CMake/AbseilHelpers.cmake +@@ -181,7 +181,7 @@ + Libs: -L\${libdir} $ $<$>:-labsl_${_NAME}>\n\ + Cflags: -I\${includedir}${PC_CFLAGS}\n") + INSTALL(FILES "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + endif() + endif() + -- cgit v1.3