[gentoo-commits] repo/gentoo:master commit in: dev-libs/libfido2/

[Mike Gilbert]

commit:     13b6694ac59f5256496d9971889713c43264533d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 10 15:16:00 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 15:16:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b6694a

dev-libs/libfido2: disable static-libs and examples at build time

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-libs/libfido2/libfido2-1.7.0.ebuild | 12 +++---------
 dev-libs/libfido2/libfido2-1.8.0.ebuild | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/dev-libs/libfido2/libfido2-1.7.0.ebuild b/dev-libs/libfido2/libfido2-1.7.0.ebuild
index 268a26e22c6..cfb5b10e123 100644
--- a/dev-libs/libfido2/libfido2-1.7.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.7.0.ebuild
@@ -41,20 +41,14 @@ 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)
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_STATIC_LIBS=$(usex static-libs ON OFF)
+		-DNFC_LINUX=$(usex nfc ON OFF)
 	)
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-
-	if ! use static-libs; then
-		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 a9a9f3c2f64..4f21ba8a9db 100644
--- a/dev-libs/libfido2/libfido2-1.8.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.8.0.ebuild
@@ -41,20 +41,14 @@ 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)
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_STATIC_LIBS=$(usex static-libs ON OFF)
+		-DNFC_LINUX=$(usex nfc ON OFF)
 	)
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-
-	if ! use static-libs; then
-		rm "${ED}/usr/$(get_libdir)/libfido2.a" || die
-	fi
-
 	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
 }