CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

openflow: Fix build build with musl/gcc14

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2024-05-18 10:45:18 -07:00
parent ebae86d9dd
commit bc0a516502
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch Normal file
View File

@ -0,0 +1,62 @@
From 2272df8407d86519d72504d6468b710e7eb56de8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 18 May 2024 00:23:43 -0700
Subject: [PATCH] Link in libexecinfo if it has backtrace() API
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
m4/libopenflow.m4 | 5 +++++
tests/automake.mk | 2 +-
utilities/automake.mk | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/m4/libopenflow.m4 b/m4/libopenflow.m4
index 58014ed..c9302b8 100644
--- a/m4/libopenflow.m4
+++ b/m4/libopenflow.m4
@@ -96,6 +96,11 @@ AC_DEFUN([OFP_CHECK_FAULT_LIBS],
[AC_CHECK_LIB([dl], [dladdr], [FAULT_LIBS=-ldl])
AC_SUBST([FAULT_LIBS])])
+dnl Checks for libraries needed by lib/fault.c.
+AC_DEFUN([OFP_CHECK_FAULT_LIBS],
+ [AC_CHECK_LIB([execinfo], [backtrace], [FAULT_LIBS=-lexecinfo])
+ AC_SUBST([FAULT_LIBS])])
+
dnl Checks for libraries needed by lib/socket-util.c.
AC_DEFUN([OFP_CHECK_SOCKET_LIBS],
[AC_CHECK_LIB([socket], [connect])
diff --git a/tests/automake.mk b/tests/automake.mk
index a4e945a..0944275 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -27,7 +27,7 @@ EXTRA_DIST += tests/test-stp.sh
noinst_PROGRAMS += tests/test-stp
tests_test_stp_SOURCES = tests/test-stp.c
-tests_test_stp_LDADD = lib/libopenflow.a
+tests_test_stp_LDADD = lib/libopenflow.a $(FAULT_LIBS)
stp_files = \
tests/test-stp-ieee802.1d-1998 \
tests/test-stp-ieee802.1d-2004-fig17.4 \
diff --git a/utilities/automake.mk b/utilities/automake.mk
index d6f79a8..0608655 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -36,10 +36,10 @@ utilities_dpctl_SOURCES = utilities/dpctl.c
utilities_dpctl_LDADD = lib/libopenflow.a $(FAULT_LIBS) $(SSL_LIBS)
utilities_vlogconf_SOURCES = utilities/vlogconf.c
-utilities_vlogconf_LDADD = lib/libopenflow.a
+utilities_vlogconf_LDADD = lib/libopenflow.a $(FAULT_LIBS)
utilities_ofp_discover_SOURCES = utilities/ofp-discover.c
-utilities_ofp_discover_LDADD = lib/libopenflow.a
+utilities_ofp_discover_LDADD = lib/libopenflow.a $(FAULT_LIBS)
utilities_ofp_kill_SOURCES = utilities/ofp-kill.c
utilities_ofp_kill_LDADD = lib/libopenflow.a
--
2.45.1

3
meta-networking/recipes-protocols/openflow/openflow_git.bb
View File

@ -21,6 +21,7 @@ SRC_URI = "git://github.com/mininet/openflow;protocol=https;branch=master \
file://0001-generate-not-static-get_dh-functions.patch \
file://0001-socket-util-Include-sys-stat.h-for-fchmod.patch \
file://0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch \
file://0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch \
"
CVE_STATUS[CVE-2015-1611] = "not-applicable-config: Not referred to our implementation of openflow"
CVE_STATUS[CVE-2015-1612] = "not-applicable-config: Not referred to our implementation of openflow"
@ -34,9 +35,7 @@ EXTRA_OECONF += " \
KARCH=${TARGET_ARCH} \
${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \
"
DEPENDS:append:libc-musl = " libexecinfo"
LDFLAGS:append:libc-musl = " -lexecinfo"
S = "${WORKDIR}/git"