diff options
Diffstat (limited to 'dev-cpp/abseil-cpp')
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild) | 9 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch | 11 |
2 files changed, 17 insertions, 3 deletions
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild index 76584ee76a1b..dfac84cf0865 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild @@ -14,7 +14,7 @@ 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}" + test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" LICENSE=" Apache-2.0 @@ -36,6 +36,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20200923-arm_no_crypto.patch" + "${FILESDIR}/${PN}-20210324-pkgconfig_path.patch" ) src_prepare() { @@ -53,8 +54,10 @@ src_prepare() { 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 + if use test; then + sed -i 's/-Werror//g' \ + "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die + fi } 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} $<JOIN:${ABSL_CC_LIB_LINKOPTS}, > $<$<NOT:$<BOOL:${ABSL_CC_LIB_IS_INTERFACE}>>:-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() + |