Changeset 2138553 for configure.in


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    rc04929c r2138553  
    394394    # Add to our libpath location
    395395    LDFLAGS="$LDFLAGS -L$RTE_SDK/$RTE_TARGET/lib/"
    396     AC_CHECK_LIB(rte_eal, rte_eal_init, dpdk_found=1, dpdk_found=0, -lpthread -lrte_malloc -lethdev -lrte_mempool -lrte_ring)
     396    # Test that the library exists, we cannot be sure of what extra library flags need to be added
     397    # this could change in the next version which would make the test fail
     398    #AC_CHECK_LIB(intel_dpdk, rte_eal_init, dpdk_found=1, dpdk_found=0, -lpthread -lm -lrt)
     399
     400    # So instead simply check for existence
     401    AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libintel_dpdk.a", dpdk_found=1, dpdk_found=0)
    397402    # Revert back
    398403    LDFLAGS="$saved_ldflags"
     
    401406                AC_SUBST([RTE_TARGET])
    402407        AC_SUBST([RTE_SDK])
    403         LIBTRACE_LIBS="$LIBTRACE_LIBS -lrte_eal -lrte_pmd_e1000 -lrte_pmd_ixgbe"
    404         LIBTRACE_LIBS="$LIBTRACE_LIBS -lethdev -lrte_mempool -lrte_ring -lrte_malloc"
    405         LIBTRACE_LIBS="$LIBTRACE_LIBS -lrte_mbuf"
     408        # Force dpdk library to be statically linked to allow compiler optimisations
     409        LIBTRACE_LIBS="$LIBTRACE_LIBS -l:libintel_dpdk.a"
    406410                AC_DEFINE(HAVE_DPDK,1,[conditional for building with DPDK live capture support])
    407411                libtrace_dpdk=true
     
    457461fi
    458462
    459 if test "$have_get_clocktime" = 1; then
     463
     464if test "$have_clock_gettime" = 1; then
    460465    LIBTRACE_LIBS="$LIBTRACE_LIBS -lrt"
    461466fi
     
    679684    AC_MSG_NOTICE([Compiled with DPDK live capture support: Yes])
    680685else
    681     AC_MSG_NOTICE([Compiled with DPDK live capture support: No])
     686    AC_MSG_NOTICE([Compiled with DPDK live capture support: No (Requires DPDK v1.5 or newer)])
    682687fi
    683688reportopt "Compiled with LLVM BPF JIT support" $JIT
Note: See TracChangeset for help on using the changeset viewer.