commit:     1eea8f0916df18ecd7af4852865e82b00c6a61e6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 10 14:46:36 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 14:46:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eea8f09

dev-libs/libfido2: fix static-libs USE flag

Closes: https://bugs.gentoo.org/812347
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-libs/libfido2/libfido2-1.7.0.ebuild | 5 ++++-
 dev-libs/libfido2/libfido2-1.8.0.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libfido2/libfido2-1.7.0.ebuild 
b/dev-libs/libfido2/libfido2-1.7.0.ebuild
index 0595624cba5..268a26e22c6 100644
--- a/dev-libs/libfido2/libfido2-1.7.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.7.0.ebuild
@@ -42,6 +42,9 @@ pkg_pretend() {
 src_configure() {
        local mycmakeargs=(
                -DNFC_LINUX="$(usex nfc)"
+               # Un-comment this once this issue is resolved.
+               # https://github.com/Yubico/libfido2/issues/389
+               #-DBUILD_STATIC_LIBS=$(usex static-libs ON OFF)
        )
        cmake_src_configure
 }
@@ -50,7 +53,7 @@ src_install() {
        cmake_src_install
 
        if ! use static-libs; then
-               rm -f "${ED}/$(get_libdir)"/*.a || die
+               rm "${ED}/usr/$(get_libdir)/libfido2.a" || die
        fi
 
        udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules

diff --git a/dev-libs/libfido2/libfido2-1.8.0.ebuild 
b/dev-libs/libfido2/libfido2-1.8.0.ebuild
index 27c29c15d50..a9a9f3c2f64 100644
--- a/dev-libs/libfido2/libfido2-1.8.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.8.0.ebuild
@@ -42,6 +42,9 @@ pkg_pretend() {
 src_configure() {
        local mycmakeargs=(
                -DNFC_LINUX="$(usex nfc)"
+               # Un-comment this once this issue is resolved.
+               # https://github.com/Yubico/libfido2/issues/389
+               #-DBUILD_STATIC_LIBS=$(usex static-libs ON OFF)
        )
        cmake_src_configure
 }
@@ -50,7 +53,7 @@ src_install() {
        cmake_src_install
 
        if ! use static-libs; then
-               rm -f "${ED}/$(get_libdir)"/*.a || die
+               rm "${ED}/usr/$(get_libdir)/libfido2.a" || die
        fi
 
        udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules

Reply via email to