View | Details | Raw Unified | Return to bug 262305
Collapse All | Expand All

(-)b/devel/libsigrokdecode/Makefile (-1 / +3 lines)
Lines 10-18 COMMENT= Framework for hardware logic analyzers, protocol decoders library Link Here
10
10
11
LICENSE=	GPLv3
11
LICENSE=	GPLv3
12
12
13
GNU_CONFIGURE=	yes
14
USES=		gnome libtool pathfix pkgconfig python:3.4+
13
USES=		gnome libtool pathfix pkgconfig python:3.4+
15
USE_GNOME=	glib20
14
USE_GNOME=	glib20
15
16
GNU_CONFIGURE=	yes
17
CONFIGURE_ENV=	PYTHON3=${PYTHON_CMD}
16
MAKE_JOBS_UNSAFE=	yes
18
MAKE_JOBS_UNSAFE=	yes
17
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
18
INSTALL_TARGET=	install-strip
20
INSTALL_TARGET=	install-strip
(-)b/devel/libsigrokdecode/files/patch-configure (+44 lines)
Added Link Here
1
--- configure.orig	2019-12-11 21:37:52 UTC
2
+++ configure
3
@@ -13200,6 +13200,30 @@ sr_pkg_check_summary_append() {
4
 # first, since usually only that variant will add "-lpython3.8".
5
 # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
6
 if test -n "$PKG_CONFIG" && \
7
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-3.9-embed\""; } >&5
8
+  ($PKG_CONFIG --exists --print-errors "python-3.9-embed") 2>&5
9
+  ac_status=$?
10
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11
+  test $ac_status = 0; }; then
12
+  	sr_have_python3=yes
13
+	SRD_PKGLIBS=${SRD_PKGLIBS}${SRD_PKGLIBS:+' '}"python-3.9-embed"
14
+	sr_python3_version=`$PKG_CONFIG --modversion "python-3.9-embed" 2>&5`
15
+	sr_pkg_check_summary_append "python-3.9-embed" "$sr_python3_version"
16
+else
17
+  	sr_pkg_check_summary_append "python-3.9-embed" no
18
+	if test -n "$PKG_CONFIG" && \
19
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-3.9 >= 3.9\""; } >&5
20
+  ($PKG_CONFIG --exists --print-errors "python-3.9 >= 3.9") 2>&5
21
+  ac_status=$?
22
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
23
+  test $ac_status = 0; }; then
24
+  	sr_have_python3=yes
25
+	SRD_PKGLIBS=${SRD_PKGLIBS}${SRD_PKGLIBS:+' '}"python-3.9 >= 3.9"
26
+	sr_python3_version=`$PKG_CONFIG --modversion "python-3.9 >= 3.9" 2>&5`
27
+	sr_pkg_check_summary_append "python-3.9 >= 3.9" "$sr_python3_version"
28
+else
29
+  	sr_pkg_check_summary_append "python-3.9 >= 3.8" no
30
+	if test -n "$PKG_CONFIG" && \
31
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-3.8-embed\""; } >&5
32
   ($PKG_CONFIG --exists --print-errors "python-3.8-embed") 2>&5
33
   ac_status=$?
34
@@ -13308,6 +13332,10 @@ else
35
 else
36
   	sr_pkg_check_summary_append "python3 >= 3.2" no
37
 	sr_have_python3=no sr_python3_version=
38
+fi
39
+
40
+fi
41
+
42
 fi
43
 
44
 fi

Return to bug 262305