diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2024-08-25 17:17:43 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2024-08-25 17:21:19 +0200 |
| commit | 467e4946e9d54c58f5c20455181181eb04759762 (patch) | |
| tree | 89199bdf3d8e5da406a36e52e75cf784cb6abf4e /dev-libs/protobuf | |
| parent | dev-perl/IO-Tty-1.200.0: marked ~arm64-macos (diff) | |
| download | gentoo-467e4946e9d54c58f5c20455181181eb04759762.tar.gz gentoo-467e4946e9d54c58f5c20455181181eb04759762.tar.bz2 gentoo-467e4946e9d54c58f5c20455181181eb04759762.zip | |
dev-libs/protobuf-27.2: fix SLOT check for non-.so platforms
use get_libname to check for appropriate output, may help with bug #891469
Bug: https://bugs.gentoo.org/891469
Closes: https://bugs.gentoo.org/930170
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'dev-libs/protobuf')
| -rw-r--r-- | dev-libs/protobuf/protobuf-27.2.ebuild | 8 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-9999.ebuild | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dev-libs/protobuf/protobuf-27.2.ebuild b/dev-libs/protobuf/protobuf-27.2.ebuild index e6c26cbfee3a..1e406912d89b 100644 --- a/dev-libs/protobuf/protobuf-27.2.ebuild +++ b/dev-libs/protobuf/protobuf-27.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib elisp-common toolchain-funcs +inherit cmake-multilib elisp-common toolchain-funcs multilib ABSEIL_BRANCH="lts_2023_08_02" # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules @@ -18,7 +18,7 @@ if [[ "${PV}" == *9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" MY_SLOT=$(ver_cut 1-2) fi @@ -127,9 +127,9 @@ src_test() { multilib_src_install_all() { find "${ED}" -name "*.la" -delete || die - if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then + if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \ - "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" + "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" die "Please update SLOT variable" fi diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild index c2a90ff0480c..9988631acc75 100644 --- a/dev-libs/protobuf/protobuf-9999.ebuild +++ b/dev-libs/protobuf/protobuf-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib elisp-common toolchain-funcs +inherit cmake-multilib elisp-common toolchain-funcs multilib ABSEIL_BRANCH="lts_2023_08_02" # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules @@ -127,9 +127,9 @@ src_test() { multilib_src_install_all() { find "${ED}" -name "*.la" -delete || die - if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then + if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \ - "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" + "Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" die "Please update SLOT variable" fi |