From acad0c3cbd2fe286e82372ff16dd594388e5b794 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 24 Apr 2023 16:01:01 +0200 Subject: [PATCH] libyubikey, disable static library (#8507) --- sys-auth/libyubikey/libyubikey-1.13.recipe | 34 +++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/sys-auth/libyubikey/libyubikey-1.13.recipe b/sys-auth/libyubikey/libyubikey-1.13.recipe index c81184529..82bf6a1ab 100644 --- a/sys-auth/libyubikey/libyubikey-1.13.recipe +++ b/sys-auth/libyubikey/libyubikey-1.13.recipe @@ -1,22 +1,31 @@ SUMMARY="Low level C SDK for the Yubico YubiKey authentication device" -DESCRIPTION="C library for manipulating Yubico YubiKey One-Time Passwords \ -(OTPs)" +DESCRIPTION="C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)" HOMEPAGE="https://developers.yubico.com/yubico-c/" COPYRIGHT="2008-2015 Yubico AB" LICENSE="BSD (2-clause)" -REVISION="6" +REVISION="7" SOURCE_URI="https://developers.yubico.com/yubico-c/Releases/libyubikey-$portVersion.tar.gz" CHECKSUM_SHA256="04edd0eb09cb665a05d808c58e1985f25bb7c5254d2849f36a0658ffc51c3401" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +libVersion="0.1.7" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" libyubikey$secondaryArchSuffix = $portVersion - cmd:modhex$secondaryArchSuffix = $portVersion - cmd:ykgenerate$secondaryArchSuffix = $portVersion - cmd:ykparse$secondaryArchSuffix = $portVersion - lib:libyubikey$secondaryArchSuffix = 0.1.7 compat >= 0 + cmd:modhex$commandSuffix = $portVersion + cmd:ykgenerate$commandSuffix = $portVersion + cmd:ykparse$commandSuffix = $portVersion + lib:libyubikey$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -26,7 +35,7 @@ REQUIRES=" PROVIDES_devel=" libyubikey${secondaryArchSuffix}_devel = $portVersion - devel:libyubikey$secondaryArchSuffix = 0.1.7 compat >= 0 + devel:libyubikey$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" libyubikey$secondaryArchSuffix == $portVersion base @@ -48,7 +57,10 @@ BUILD_PREREQUIRES=" BUILD() { - runConfigure ./configure --disable-dependency-tracking + runConfigure --omit-dirs binDir ./configure \ + --bindir=$commandBinDir \ + --disable-static \ + --disable-dependency-tracking make $jobArgs } @@ -61,10 +73,6 @@ INSTALL() prepareInstalledDevelLib libyubikey fixPkgconfig - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $manDir - fi - packageEntries devel \ $developDir }