Changeset b06b894


Ignore:
Timestamp:
06/28/18 11:55:57 (2 years ago)
Author:
GitHub <noreply@…>
Branches:
cachetimestamps, develop, master, rc-4.0.4, ringdecrementfix, ringperformance
Children:
a0f031b
Parents:
1ed69dc (diff), 055a2c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Shane Alcock <salcock@…> (06/28/18 11:55:57)
git-committer:
GitHub <noreply@…> (06/28/18 11:55:57)
Message:

Merge pull request #73 from LibtraceTeam?/fix_no_wandder

Fix for building without WANDDER

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r096851a r055a2c9  
    489489        with_numa=yes
    490490else
    491         AC_DEFINE(HAVE_LIBNUMA, 0, [Set to 1 if libnuma is supported])
    492491        with_numa=no
    493492fi
     
    498497        wandder_avail=yes
    499498else
    500         AC_DEFINE(HAVE_WANDDER, 0, [Set to 1 if libwandder is available])
    501499        wandder_avail=no
    502500fi
     
    549547        with_clock_gettime=yes
    550548else
    551         AC_DEFINE(HAVE_CLOCK_GETTIME, 0, [Set to 1 if clock_gettime is supported])
    552549        with_clock_gettime=no
    553550fi
  • lib/format_dpdk.c

    r32ee9b2 r055a2c9  
    5757#include <math.h>
    5858
    59 #if HAVE_LIBNUMA
     59#ifdef HAVE_LIBNUMA
    6060#include <numa.h>
    6161#endif
     
    460460        }
    461461
    462 #if HAVE_LIBNUMA
     462#ifdef HAVE_LIBNUMA
    463463        format_data->nic_numa_node = pci_to_numa(&use_addr);
    464464        if (my_cpu < 0) {
     
    891891         * these to any particular physical core */
    892892        if (real) {
    893 #if HAVE_LIBNUMA
     893#ifdef HAVE_LIBNUMA
    894894                for (i = 0; i < RTE_MAX_LCORE; ++i) {
    895895                        if (!rte_lcore_is_enabled(i) && numa_node_of_cpu(i) == socket) {
  • libpacketdump/Makefile.am

    ra82a9e8 r055a2c9  
    6262
    6363# 22: ETSI LI
     64if HAVE_WANDDER
    6465BIN_PROTOCOLS+=link_22.la
     66endif
    6567
    6668# Decoders for various ethertypes (in decimal)
     
    138140link_11_la_LDFLAGS=$(modflags)
    139141link_15_la_LDFLAGS=$(modflags)
     142if HAVE_WANDDER
    140143link_22_la_LDFLAGS=$(modflags)
     144endif
    141145eth_0_la_LDFLAGS=$(modflags)
    142146eth_2048_la_LDFLAGS=$(modflags)
Note: See TracChangeset for help on using the changeset viewer.