From 4035dfc557c113f528322669959330ba9fe3a9d4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 9 Nov 2022 21:05:57 +0100 Subject: frr: add a patch to correctly check presence of python from pkg-config Signed-off-by: Alexander Kanavin Signed-off-by: Khem Raj --- ...n.m4-check-for-python-x.y-emded.pc-not-py.patch | 28 ++++++++++++++++++++++ meta-networking/recipes-protocols/frr/frr_8.3.1.bb | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-protocols/frr/frr/0001-m4-ax_python.m4-check-for-python-x.y-emded.pc-not-py.patch (limited to 'meta-networking/recipes-protocols/frr') diff --git a/meta-networking/recipes-protocols/frr/frr/0001-m4-ax_python.m4-check-for-python-x.y-emded.pc-not-py.patch b/meta-networking/recipes-protocols/frr/frr/0001-m4-ax_python.m4-check-for-python-x.y-emded.pc-not-py.patch new file mode 100644 index 0000000000..9e5cfd8f55 --- /dev/null +++ b/meta-networking/recipes-protocols/frr/frr/0001-m4-ax_python.m4-check-for-python-x.y-emded.pc-not-py.patch @@ -0,0 +1,28 @@ +From 6a2984718d7c47612b07be46d663e7b5e5b7c57d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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}]) diff --git a/meta-networking/recipes-protocols/frr/frr_8.3.1.bb b/meta-networking/recipes-protocols/frr/frr_8.3.1.bb index 1abea6345a..67d50e3edc 100644 --- a/meta-networking/recipes-protocols/frr/frr_8.3.1.bb +++ b/meta-networking/recipes-protocols/frr/frr_8.3.1.bb @@ -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" -- cgit v1.2.3-54-g00ecf