mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 14:59:55 +00:00
frr: add a patch to correctly check presence of python from pkg-config
Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
d04444509a
commit
4035dfc557
+28
@@ -0,0 +1,28 @@
|
||||
From 6a2984718d7c47612b07be46d663e7b5e5b7c57d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Wed, 9 Nov 2022 20:24:45 +0100
|
||||
Subject: [PATCH] m4/ax_python.m4: check for python-x.y-emded.pc, not
|
||||
python-x.y.pc
|
||||
|
||||
Only the embed version includes necessary linker flags to link
|
||||
with libpython.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/12298]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
m4/ax_python.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/ax_python.m4 b/m4/ax_python.m4
|
||||
index 91d12b99b..f5e603b96 100644
|
||||
--- a/m4/ax_python.m4
|
||||
+++ b/m4/ax_python.m4
|
||||
@@ -206,7 +206,7 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_MSG_CHECKING([whether pkg-config python-${tryver} is available])
|
||||
unset PYTHON_CFLAGS
|
||||
unset PYTHON_LIBS
|
||||
- pkg="python-${tryver}"
|
||||
+ pkg="python-${tryver}-embed"
|
||||
pkg="${pkg%-}"
|
||||
_PKG_CONFIG([PYTHON_CFLAGS], [cflags], [${pkg}])
|
||||
_PKG_CONFIG([PYTHON_LIBS], [libs], [${pkg}])
|
||||
@@ -15,7 +15,8 @@ SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/8.3 \
|
||||
file://0001-bgpd-avoid-notify-race-between-io-and-main-pthreads.patch \
|
||||
file://0001-bgpd-Make-sure-hdr-length-is-at-a-minimum-of-what-is.patch \
|
||||
file://frr.pam \
|
||||
"
|
||||
file://0001-m4-ax_python.m4-check-for-python-x.y-emded.pc-not-py.patch \
|
||||
"
|
||||
|
||||
SRCREV = "a74f7a9ad9623e6f9654fe4a7177e5da0b194828"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user