maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(oran_fhlib_5g): pkgconfig fix for E release

Browse Source 
E release had the same issue of not using pkgconfig properly as F release.
This issue was fixed in F release when enabling its compatibility with DPDK 21+.
This commit brings this fix to E release.
This commit is contained in:
Romain Beurdouche
2025-07-09 14:55:44 +02:00
committed by Robert Schmidt
parent 486726233d
commit 8e33727c37
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch
+10 -7
View File
@@ -1,5 +1,5 @@
diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h
index 7508117..ce17ebd 100644 index 7508117..318508b 100644
--- a/fhi_lib/app/src/common.h --- a/fhi_lib/app/src/common.h
+++ b/fhi_lib/app/src/common.h +++ b/fhi_lib/app/src/common.h
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
@@ -7,12 +7,12 @@ index 7508117..ce17ebd 100644
#include <rte_mbuf.h> #include <rte_mbuf.h>
-#define VERSIONX "oran_e_maintenance_release_v1.0" -#define VERSIONX "oran_e_maintenance_release_v1.0"
+#define VERSIONX "oran_e_maintenance_release_v1.5" +#define VERSIONX "oran_e_maintenance_release_v1.6"
#define APP_O_DU 0 #define APP_O_DU 0
#define APP_O_RU 1 #define APP_O_RU 1
diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile
index de141bf..fa2923f 100644 index de141bf..c2a448d 100644
--- a/fhi_lib/lib/Makefile --- a/fhi_lib/lib/Makefile
+++ b/fhi_lib/lib/Makefile +++ b/fhi_lib/lib/Makefile
@@ -23,12 +23,25 @@ MYCUSTOMSPACE1='------------------------------------------------------------' @@ -23,12 +23,25 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
@@ -50,9 +50,9 @@ index de141bf..fa2923f 100644
-RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk) -RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
+ifeq ($(TARGET), x86) +ifeq ($(TARGET), x86)
+RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk) +RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkg-config --cflags-only-I libdpdk)
+else ifeq ($(TARGET), armv8) +else ifeq ($(TARGET), armv8)
+RTE_INC := $(pkgconf --cflags-only-I libdpdk) +RTE_INC := $(shell pkg-config --cflags-only-I libdpdk)
+endif +endif
API_DIR := $(PROJECT_DIR)/api API_DIR := $(PROJECT_DIR)/api
SRC_DIR := $(PROJECT_DIR)/src SRC_DIR := $(PROJECT_DIR)/src
@@ -85,7 +85,7 @@ index de141bf..fa2923f 100644
CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations \ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations \
-fdata-sections \ -fdata-sections \
@@ -112,12 +132,21 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations \ @@ -112,14 +132,23 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations \
-fPIC \ -fPIC \
-Wall \ -Wall \
-Wimplicit-function-declaration \ -Wimplicit-function-declaration \
@@ -110,8 +110,11 @@ index de141bf..fa2923f 100644
+ -Werror -Wno-unused-variable -std=c++14 + -Werror -Wno-unused-variable -std=c++14
+endif +endif
INC := -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC) -INC := -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)
+INC := -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) $(RTE_INC)
DEF := DEF :=
ifeq ($(MLOG),1)
INC += -I$(MLOG_DIR)/source
@@ -150,8 +179,13 @@ CPP_SNC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS_SNC)) @@ -150,8 +179,13 @@ CPP_SNC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS_SNC))
AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS)) AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS))
radio/fhi_72/CMakeLists.txt
+1 -1
View File
@@ -16,7 +16,7 @@ add_library(oran_fhlib_5g MODULE
oran-init.c oran-init.c
) )
set(E_VERSION 5.1.5) set(E_VERSION 5.1.6)
set(F_VERSION 6.1.4) set(F_VERSION 6.1.4)
find_package(xran REQUIRED) find_package(xran REQUIRED)