| Message ID | 1461838907-16842-1-git-send-email-matias.elo@nokia.com |
|---|---|
| State | Accepted |
| Commit | 252cda14ac2a57f37b97163554d5a1a19e5e7fb6 |
| Headers | show |
For this series: Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> On Thu, Apr 28, 2016 at 5:21 AM, Matias Elo <matias.elo@nokia.com> wrote: > Currently, enabling dpdk pktio support disables pcap pktio > due to LIBS getting contaminated. Circumvent this problem by > reordering the m4 includes. > > Signed-off-by: Matias Elo <matias.elo@nokia.com> > --- > platform/linux-generic/m4/configure.m4 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/platform/linux-generic/m4/configure.m4 > b/platform/linux-generic/m4/configure.m4 > index 2933263..2070bfb 100644 > --- a/platform/linux-generic/m4/configure.m4 > +++ b/platform/linux-generic/m4/configure.m4 > @@ -30,9 +30,9 @@ AC_LINK_IFELSE( > > m4_include([platform/linux-generic/m4/odp_pthread.m4]) > m4_include([platform/linux-generic/m4/odp_openssl.m4]) > +m4_include([platform/linux-generic/m4/odp_pcap.m4]) > m4_include([platform/linux-generic/m4/odp_netmap.m4]) > m4_include([platform/linux-generic/m4/odp_dpdk.m4]) > -m4_include([platform/linux-generic/m4/odp_pcap.m4]) > > AC_CONFIG_FILES([platform/linux-generic/Makefile > platform/linux-generic/test/Makefile > -- > 1.9.1 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp >
Merged, tested that make check also passes with new version of dpdk. Updated version also has arm configs for dpdk, and it will be great to verify arm build also. Maxim. On 04/28/16 18:23, Bill Fischofer wrote: > For this series: > > Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org > <mailto:bill.fischofer@linaro.org>> > > On Thu, Apr 28, 2016 at 5:21 AM, Matias Elo <matias.elo@nokia.com > <mailto:matias.elo@nokia.com>> wrote: > > Currently, enabling dpdk pktio support disables pcap pktio > due to LIBS getting contaminated. Circumvent this problem by > reordering the m4 includes. > > Signed-off-by: Matias Elo <matias.elo@nokia.com > <mailto:matias.elo@nokia.com>> > --- > platform/linux-generic/m4/configure.m4 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/platform/linux-generic/m4/configure.m4 > b/platform/linux-generic/m4/configure.m4 > index 2933263..2070bfb 100644 > --- a/platform/linux-generic/m4/configure.m4 > +++ b/platform/linux-generic/m4/configure.m4 > @@ -30,9 +30,9 @@ AC_LINK_IFELSE( > > m4_include([platform/linux-generic/m4/odp_pthread.m4]) > m4_include([platform/linux-generic/m4/odp_openssl.m4]) > +m4_include([platform/linux-generic/m4/odp_pcap.m4]) > m4_include([platform/linux-generic/m4/odp_netmap.m4]) > m4_include([platform/linux-generic/m4/odp_dpdk.m4]) > -m4_include([platform/linux-generic/m4/odp_pcap.m4]) > > AC_CONFIG_FILES([platform/linux-generic/Makefile > platform/linux-generic/test/Makefile > -- > 1.9.1 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > https://lists.linaro.org/mailman/listinfo/lng-odp > > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 2933263..2070bfb 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -30,9 +30,9 @@ AC_LINK_IFELSE( m4_include([platform/linux-generic/m4/odp_pthread.m4]) m4_include([platform/linux-generic/m4/odp_openssl.m4]) +m4_include([platform/linux-generic/m4/odp_pcap.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) -m4_include([platform/linux-generic/m4/odp_pcap.m4]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/test/Makefile
Currently, enabling dpdk pktio support disables pcap pktio due to LIBS getting contaminated. Circumvent this problem by reordering the m4 includes. Signed-off-by: Matias Elo <matias.elo@nokia.com> --- platform/linux-generic/m4/configure.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)