| 1 |
commit: 1eea8f0916df18ecd7af4852865e82b00c6a61e6 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 10 14:46:36 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 10 14:46:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eea8f09 |
| 7 |
|
| 8 |
dev-libs/libfido2: fix static-libs USE flag |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/812347 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/libfido2/libfido2-1.7.0.ebuild | 5 ++++- |
| 14 |
dev-libs/libfido2/libfido2-1.8.0.ebuild | 5 ++++- |
| 15 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/libfido2/libfido2-1.7.0.ebuild b/dev-libs/libfido2/libfido2-1.7.0.ebuild |
| 18 |
index 0595624cba5..268a26e22c6 100644 |
| 19 |
--- a/dev-libs/libfido2/libfido2-1.7.0.ebuild |
| 20 |
+++ b/dev-libs/libfido2/libfido2-1.7.0.ebuild |
| 21 |
@@ -42,6 +42,9 @@ pkg_pretend() { |
| 22 |
src_configure() { |
| 23 |
local mycmakeargs=( |
| 24 |
-DNFC_LINUX="$(usex nfc)" |
| 25 |
+ # Un-comment this once this issue is resolved. |
| 26 |
+ # https://github.com/Yubico/libfido2/issues/389 |
| 27 |
+ #-DBUILD_STATIC_LIBS=$(usex static-libs ON OFF) |
| 28 |
) |
| 29 |
cmake_src_configure |
| 30 |
} |
| 31 |
@@ -50,7 +53,7 @@ src_install() { |
| 32 |
cmake_src_install |
| 33 |
|
| 34 |
if ! use static-libs; then |
| 35 |
- rm -f "${ED}/$(get_libdir)"/*.a || die |
| 36 |
+ rm "${ED}/usr/$(get_libdir)/libfido2.a" || die |
| 37 |
fi |
| 38 |
|
| 39 |
udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules |
| 40 |
|
| 41 |
diff --git a/dev-libs/libfido2/libfido2-1.8.0.ebuild b/dev-libs/libfido2/libfido2-1.8.0.ebuild |
| 42 |
index 27c29c15d50..a9a9f3c2f64 100644 |
| 43 |
--- a/dev-libs/libfido2/libfido2-1.8.0.ebuild |
| 44 |
+++ b/dev-libs/libfido2/libfido2-1.8.0.ebuild |
| 45 |
@@ -42,6 +42,9 @@ pkg_pretend() { |
| 46 |
src_configure() { |
| 47 |
local mycmakeargs=( |
| 48 |
-DNFC_LINUX="$(usex nfc)" |
| 49 |
+ # Un-comment this once this issue is resolved. |
| 50 |
+ # https://github.com/Yubico/libfido2/issues/389 |
| 51 |
+ #-DBUILD_STATIC_LIBS=$(usex static-libs ON OFF) |
| 52 |
) |
| 53 |
cmake_src_configure |
| 54 |
} |
| 55 |
@@ -50,7 +53,7 @@ src_install() { |
| 56 |
cmake_src_install |
| 57 |
|
| 58 |
if ! use static-libs; then |
| 59 |
- rm -f "${ED}/$(get_libdir)"/*.a || die |
| 60 |
+ rm "${ED}/usr/$(get_libdir)/libfido2.a" || die |
| 61 |
fi |
| 62 |
|
| 63 |
udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules |
Archives