On Mon, Jan 10 2022, k...@openbsd.org wrote: > Bulk build on sparc64-0a.ports.openbsd.org
[...] > http://build-failures.rhaalovely.net/sparc64/2022-01-07/comms/sigrok/pulseview.log > http://build-failures.rhaalovely.net/sparc64/2022-01-07/comms/sigrok/sigrok-cli.log Uses symbols from libsigrokedecode.so but doesn't link against it due to a failure to detect python-3.9-embed. This is more visible on ld.bfd archs but not specific to them, regress tests also fail to link on ld.lld archs. The diff below fixes the detection of libpython3.9 and also enables said regress tests. ok? Index: Makefile =================================================================== RCS file: /home/cvs/ports/comms/sigrok/libsigrokdecode/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile 2 Nov 2021 00:00:15 -0000 1.8 +++ Makefile 11 Jan 2022 00:34:59 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.8 2021/11/02 00:00:15 sthen Exp $ COMMENT = sigrok protocol decoding library -REVISION = 2 +REVISION = 3 SIGROK_PROJECT = libsigrokdecode SIGROK_VERSION = 0.5.3 @@ -11,8 +11,12 @@ SHARED_LIBS += sigrokdecode WANTLIB += glib-2.0 iconv intl m pcre pthread util ${MODPY_WANTLIB} MODULES = lang/python +BUILD_DEPENDS = devel/check LIB_DEPENDS = devel/glib2 DEBUG_PACKAGES = ${BUILD_PACKAGES} + +CONFIGURE_STYLE = autoconf +AUTOCONF_VERSION = 2.69 .include <bsd.port.mk> Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_ac 11 Jan 2022 00:35:13 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + +Add support for python-3.9 + +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -93,14 +93,14 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.9-embed], [python-3.9 >= 3.9], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + + # We also need to find the name of the python3 executable (for 'make install'). + # Some OSes call this python3, some call it python3.2, etc. etc. + AC_ARG_VAR([PYTHON3], [Python 3 interpreter]) +-AC_CHECK_PROGS([PYTHON3], [python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3]) ++AC_CHECK_PROGS([PYTHON3], [python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3]) + AS_IF([test "x$PYTHON3" = x], + [AC_MSG_ERROR([Cannot find Python 3 interpreter.])]) + -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
