diff --git a/dev-libs/xmlsec/xmlsec-1.2.31.recipe b/dev-libs/xmlsec/xmlsec-1.2.32.recipe similarity index 84% rename from dev-libs/xmlsec/xmlsec-1.2.31.recipe rename to dev-libs/xmlsec/xmlsec-1.2.32.recipe index c71db5491..973ac3e02 100644 --- a/dev-libs/xmlsec/xmlsec-1.2.31.recipe +++ b/dev-libs/xmlsec/xmlsec-1.2.32.recipe @@ -6,23 +6,29 @@ The library supports major XML security standards: - Canonical XML (part of the LibXML2) - Exclusive Canonical XML (part of the LibXML2)" HOMEPAGE="https://www.aleksey.com/xmlsec/" -COPYRIGHT="2002-2019 Aleksey Sanin" +COPYRIGHT="2002-2021 Aleksey Sanin" LICENSE="MIT" REVISION="1" SOURCE_URI="https://www.aleksey.com/xmlsec/download/xmlsec1-$portVersion.tar.gz" -CHECKSUM_SHA256="9b10bc52cc31e4f76162e3975e50db26b71ab49c571d810b311ca626be5a0b26" +CHECKSUM_SHA256="e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043" SOURCE_DIR="xmlsec1-$portVersion" -ARCHITECTURES="all ?x86_gcc2 ?x86" +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=" xmlsec$secondaryArchSuffix = $portVersion - cmd:xmlsec1$secondaryArchSuffix = $portVersion - cmd:xmlsec1_config$secondaryArchSuffix = $portVersion + cmd:xmlsec1$commandSuffix = $portVersion lib:libxmlsec1$secondaryArchSuffix = $libVersionCompat lib:libxmlsec1_openssl$secondaryArchSuffix = $libVersionCompat " @@ -37,6 +43,7 @@ REQUIRES=" PROVIDES_devel=" xmlsec${secondaryArchSuffix}_devel = $portVersion + cmd:xmlsec1_config$commandSuffix = $portVersion devel:libxmlsec1$secondaryArchSuffix = $libVersionCompat devel:libxmlsec1_gcrypt$secondaryArchSuffix = $libVersionCompat devel:libxmlsec1_nss$secondaryArchSuffix = $libVersionCompat @@ -113,7 +120,8 @@ defineDebugInfoPackage xmlsec$secondaryArchSuffix \ BUILD() { - runConfigure ./configure + runConfigure --omit-dirs binDir ./configure \ + --bindir=$commandBinDir make $jobArgs } @@ -132,11 +140,16 @@ INSTALL() # devel package packageEntries devel \ - $developDir $dataDir/aclocal + $commandBinDir/xmlsec1-config \ + $developDir \ + $dataDir/aclocal \ + $manDir/man1/xmlsec1-config.1 # openssl is compiled as default, so xmlsec1 command requires it to work - packageEntries nss $libDir/libxmlsec1-nss* - packageEntries gcrypt $libDir/libxmlsec1-gcrypt* + packageEntries nss \ + $libDir/libxmlsec1-nss* + packageEntries gcrypt \ + $libDir/libxmlsec1-gcrypt* } TEST()