Changeset 2138553 for configure.in

Timestamp:

02/13/14 15:00:10 (7 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:

• configure.in (modified) (4 diffs)

configure.in

@@ -394 +394 @@
     # Add to our libpath location
     LDFLAGS="$LDFLAGS -L$RTE_SDK/$RTE_TARGET/lib/"
-    AC_CHECK_LIB(rte_eal, rte_eal_init, dpdk_found=1, dpdk_found=0, -lpthread -lrte_malloc -lethdev -lrte_mempool -lrte_ring)
+    # Test that the library exists, we cannot be sure of what extra library flags need to be added
+    # this could change in the next version which would make the test fail
+    #AC_CHECK_LIB(intel_dpdk, rte_eal_init, dpdk_found=1, dpdk_found=0, -lpthread -lm -lrt)
+
+    # So instead simply check for existence
+    AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libintel_dpdk.a", dpdk_found=1, dpdk_found=0)
     # Revert back
     LDFLAGS="$saved_ldflags"
@@ -401 +406 @@
                 AC_SUBST([RTE_TARGET])
         AC_SUBST([RTE_SDK])
-        LIBTRACE_LIBS="$LIBTRACE_LIBS -lrte_eal -lrte_pmd_e1000 -lrte_pmd_ixgbe"
-        LIBTRACE_LIBS="$LIBTRACE_LIBS -lethdev -lrte_mempool -lrte_ring -lrte_malloc"
-        LIBTRACE_LIBS="$LIBTRACE_LIBS -lrte_mbuf"
+        # Force dpdk library to be statically linked to allow compiler optimisations
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -l:libintel_dpdk.a"
                 AC_DEFINE(HAVE_DPDK,1,[conditional for building with DPDK live capture support])
                 libtrace_dpdk=true
@@ -457 +461 @@
 fi
 
-if test "$have_get_clocktime" = 1; then
+
+if test "$have_clock_gettime" = 1; then
     LIBTRACE_LIBS="$LIBTRACE_LIBS -lrt"
 fi
@@ -679 +684 @@
     AC_MSG_NOTICE([Compiled with DPDK live capture support: Yes])
 else
-    AC_MSG_NOTICE([Compiled with DPDK live capture support: No])
+    AC_MSG_NOTICE([Compiled with DPDK live capture support: No (Requires DPDK v1.5 or newer)])
 fi
 reportopt "Compiled with LLVM BPF JIT support" $JIT