From 13b6694ac59f5256496d9971889713c43264533d Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 10 Sep 2021 11:16:00 -0400 Subject: dev-libs/libfido2: disable static-libs and examples at build time Signed-off-by: Mike Gilbert --- 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(-) (limited to 'dev-libs/libfido2') diff --git a/dev-libs/libfido2/libfido2-1.7.0.ebuild b/dev-libs/libfido2/libfido2-1.7.0.ebuild index 268a26e22c6e..cfb5b10e123c 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 a9a9f3c2f640..4f21ba8a9dbd 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 } -- cgit v1.2.3-65-gdbad