From b792c1f27d58040f3a815da18183d329bd6bd84b Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Thu, 30 Sep 2021 10:05:39 +0000
Subject: tldk: swtich to use DPDK 20.11 LTS

As in DPDK 20.11 'make' is not supported any more,
switch to use pkg-conf approach.
Note that RTE_SDK now should point to your DPDK package installation path.

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Change-Id: I4a3c394758e183a3ddcdb45a0562a81583daaab6
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 lib/libtle_l4p/Makefile    | 22 ++++++----------------
 lib/libtle_l4p/ctx.c       |  2 +-
 lib/libtle_l4p/syncookie.h |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'lib/libtle_l4p')

diff --git a/lib/libtle_l4p/Makefile b/lib/libtle_l4p/Makefile
index 5c8407e..04c53ba 100644
--- a/lib/libtle_l4p/Makefile
+++ b/lib/libtle_l4p/Makefile
@@ -11,24 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, can be overwritten by command line or environment
-RTE_TARGET ?= x86_64-native-linuxapp-gcc
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
 # library name
-LIB = libtle_l4p.a
+LIB_NAME = libtle_l4p
 
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-
-EXPORT_MAP := tle_l4p_version.map
-
-LIBABIVER := 1
+include $(TLDK_ROOT)/mk/tle.var.mk
 
 #source files
 SRCS-y += ctx.c
@@ -52,4 +38,8 @@ DEPDIRS-y += lib/libtle_memtank
 DEPDIRS-y += lib/libtle_dring
 DEPDIRS-y += lib/libtle_timer
 
+LIB_DEPS += tle_memtank
+LIB_DEPS += tle_dring
+LIB_DEPS += tle_timer
+
 include $(TLDK_ROOT)/mk/tle.lib.mk
diff --git a/lib/libtle_l4p/ctx.c b/lib/libtle_l4p/ctx.c
index b810983..90dcfb5 100644
--- a/lib/libtle_l4p/ctx.c
+++ b/lib/libtle_l4p/ctx.c
@@ -22,7 +22,7 @@
 
 #include "stream.h"
 #include "misc.h"
-#include <halfsiphash.h>
+#include "halfsiphash.h"
 
 #define	LPORT_START	0x8000
 #define	LPORT_END	MAX_PORT_NUM
diff --git a/lib/libtle_l4p/syncookie.h b/lib/libtle_l4p/syncookie.h
index 6d4372d..d0434e9 100644
--- a/lib/libtle_l4p/syncookie.h
+++ b/lib/libtle_l4p/syncookie.h
@@ -20,7 +20,7 @@
 
 #include "tcp_misc.h"
 #include <tle_ctx.h>
-#include <halfsiphash.h>
+#include "halfsiphash.h"
 
 #ifdef __cplusplus
 extern "C" {
-- 
cgit 1.2.3-korg