diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.recipe b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.recipe index 0f4c6b868..928f59cdb 100644 --- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.recipe +++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.recipe @@ -10,7 +10,7 @@ The protocol decoders are written in Python (>= 3.0)." HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode" COPYRIGHT="2014-2020 sigrok contributors" LICENSE="GNU GPL v3" -REVISION="4" +REVISION="5" SOURCE_URI="http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-$portVersion.tar.gz" CHECKSUM_SHA256="c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0" @@ -20,6 +20,8 @@ SECONDARY_ARCHITECTURES="x86" libVersion="4.2.1" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" +pythonVersion=3.10 + PROVIDES=" libsigrokdecode$secondaryArchSuffix = $portVersion lib:libsigrokdecode$secondaryArchSuffix = $libVersionCompat @@ -27,7 +29,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix - lib:libpython3.9$secondaryArchSuffix + lib:libpython$pythonVersion$secondaryArchSuffix lib:libintl$secondaryArchSuffix " @@ -41,8 +43,9 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libcheck$secondaryArchSuffix # for unit-tests to actually be built/run. devel:libglib_2.0$secondaryArchSuffix - devel:libpython3.9$secondaryArchSuffix + devel:libpython$pythonVersion$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:awk @@ -53,6 +56,13 @@ BUILD_PREREQUIRES=" BUILD() { + # Trying to use $LIBS makes the ./configure script to fail with: + # "configure: error: C compiler cannot create executables" (exit 77) +# export LIBS="python$pythonVersion" + + # So let's try this instead: + export LDFLAGS="-lpython$pythonVersion" + runConfigure ./configure --disable-static make $jobArgs } @@ -70,6 +80,9 @@ INSTALL() packageEntries devel $developDir } +# Results for reference: +# TOTAL:1 +# PASS:1 TEST() { make check