Changeset 2138553 for lib/Makefile.am

Timestamp:

02/13/14 15:00:10 (8 years ago)

Author:

Richard Sanger <rjs51@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

accdd5b

Parents:

bcb2402

Message:

Updates the dpdk build system to support the lastest DPDK libraries v1.5 and above
This drops support for anything before v1.5 due to the requirment to patch the build system.
Hopefully this new way will continue to work with newer releases

This removes the need to patch the DPDK library
Instead the only requirement is that DPDK is built as a static library with the following options
CONFIG_RTE_BUILD_COMBINE_LIBS=y EXTRA_CFLAGS="-fPIC added to the make command

-This line, and those below, will be ignored--

M configure.in
D Intel DPDK Patches/DPDKLibtracePatch.patch
M Intel DPDK Patches/README
M lib/format_dpdk.c
A lib/dpdk_libtrace.mk
M lib/Makefile.am

File:

• lib/Makefile.am (modified) (2 diffs)

lib/Makefile.am

@@ -35 +35 @@
 include $(RTE_SDK)/mk/rte.vars.mk
 # We need to add -Wl before the linker otherwise this breaks our build
-# This is added in with our make script patch to the DPDK library
-include $(RTE_SDK)/mk/libtrace.mk
+# And include any libraries that DPDK might depend upon
+export DPDK_LIBTRACE_MK=dpdk_libtrace.mk
+include $(DPDK_LIBTRACE_MK)
 endif
 
@@ -58 +59 @@
 
 INCLUDES= @ADD_INCLS@ -I../libwandio
-libtrace_la_LIBADD = @LIBTRACE_LIBS@ @LTLIBOBJS@
+libtrace_la_LIBADD = @LIBTRACE_LIBS@ @LTLIBOBJS@ $(DPDKLIBS)
 libtrace_la_LDFLAGS=-version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ @ADD_LDFLAGS@
-
 dagapi.c:
         cp @DAG_TOOLS_DIR@/dagapi.c .