ykpers, disable static library, fix multiple definitions error during build (#8509)

This commit is contained in:
Schrijvers Luc
2023-04-24 20:00:12 +02:00
committed by GitHub
parent 23718fd71c
commit adc6299c89
2 changed files with 40 additions and 6 deletions

View File

@@ -0,0 +1,24 @@
From 365f4e005258170ce1c58f633ce96cacbafc47c6 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 24 Apr 2023 19:44:09 +0200
Subject: fix "multiple defenitions of *" (-fno-common)
diff --git a/ykpers-args.h b/ykpers-args.h
index 2a63268..9ff455a 100644
--- a/ykpers-args.h
+++ b/ykpers-args.h
@@ -33,8 +33,8 @@
#include "ykpers.h"
-const char *usage;
-const char *optstring;
+extern const char *usage;
+extern const char *optstring;
int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, char *oathid,
size_t oathid_len, const char **infname,
--
2.37.3

View File

@@ -4,23 +4,31 @@ DESCRIPTION="A library and command line tool used to personalize \
HOMEPAGE="https://developers.yubico.com/yubico-c-client/"
COPYRIGHT="2008-2019 Yubico AB"
LICENSE="BSD (2-clause)"
REVISION="2"
REVISION="3"
SOURCE_URI="https://developers.yubico.com/yubikey-personalization/Releases/ykpers-$portVersion.tar.gz"
CHECKSUM_SHA256="0ec84d0ea862f45a7d85a1a3afe5e60b8da42df211bb7d27a50f486e31a79b93"
# patch taken from Arch Linux
PATCHES="0001-fix-boolean-value-with-json-c-0.14.patch"
PATCHES="0001-fix-boolean-value-with-json-c-0.14.patch
ykpers-1.20.0.patchset"
ARCHITECTURES="all ?x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
commandBinDir=$binDir
commandSuffix=$secondaryArchSuffix
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
libVersion="$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
ykpers$secondaryArchSuffix = $portVersion
cmd:ykchalresp$secondaryArchSuffix = $portVersion
cmd:ykinfo$secondaryArchSuffix = $portVersion
cmd:ykpersonalize$secondaryArchSuffix = $portVersion
cmd:ykchalresp$commandSuffix = $portVersion
cmd:ykinfo$commandSuffix = $portVersion
cmd:ykpersonalize$commandSuffix = $portVersion
lib:libykpers_1$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
@@ -63,7 +71,9 @@ BUILD_PREREQUIRES="
BUILD()
{
autoreconf -vfi
runConfigure ./configure
runConfigure --omit-dirs binDir ./configure \
--bindir=$commandBinDir \
--disable-static
make $jobArgs
}