rpms/dpdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Eliminate the need for the enic patch by eliminating second -Wall from CFLAGS

Browse Source
This commit is contained in:
Panu Matilainen 2016-03-01 15:53:34 +02:00
parent e0841ab3ef
commit 1382547ee6
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dpdk.spec
View File

@ -14,7 +14,6 @@ Release: 6%{?dist}
URL: http://dpdk.org URL: http://dpdk.org
Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{version}.tar.gz Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{version}.tar.gz
Patch1: enic-pun-fix.patch
Patch2: dpdk-2.2-dtneeded.patch Patch2: dpdk-2.2-dtneeded.patch
Patch4: dpdk-2.2-examples.patch Patch4: dpdk-2.2-examples.patch
Patch5: dpdk-2.2-punning.patch Patch5: dpdk-2.2-punning.patch
@ -113,7 +112,6 @@ as L2 and L3 forwarding.
%prep %prep
%setup -q %setup -q
%patch1 -p2 -z .enic
%patch2 -p1 -z .dtneeded %patch2 -p1 -z .dtneeded
%patch4 -p1 -z .examples %patch4 -p1 -z .examples
%patch5 -p1 -z .pun %patch5 -p1 -z .pun
@ -142,7 +140,9 @@ function setconf() {
# In case dpdk-devel is installed, we should ignore its hints about the SDK directories # In case dpdk-devel is installed, we should ignore its hints about the SDK directories
unset RTE_SDK RTE_INCLUDE RTE_TARGET unset RTE_SDK RTE_INCLUDE RTE_TARGET
export EXTRA_CFLAGS="%{optflags} -Wformat -fPIC" # Avoid appending second -Wall to everything, it breaks upstream warning
# disablers in makefiles
export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g') -Wformat -fPIC"
# DPDK defaults to using builder-specific compiler flags. However, # DPDK defaults to using builder-specific compiler flags. However,
# the config has been changed by specifying CONFIG_RTE_MACHINE=default # the config has been changed by specifying CONFIG_RTE_MACHINE=default
@ -293,6 +293,7 @@ install -m 644 ${comblib} %{buildroot}/%{_libdir}/${comblib}
* Tue Mar 01 2016 Panu Matilainen <pmatilai@redhat.com> - 2.2.0-6 * Tue Mar 01 2016 Panu Matilainen <pmatilai@redhat.com> - 2.2.0-6
- Drop no longer needed bnx2x patch, the gcc false positive has been fixed - Drop no longer needed bnx2x patch, the gcc false positive has been fixed
- Drop no longer needed -Wno-error=array-bounds from CFLAGS - Drop no longer needed -Wno-error=array-bounds from CFLAGS
- Eliminate the need for the enic patch by eliminating second -Wall from CFLAGS
* Mon Feb 15 2016 Neil Horman <nhorman@redhat.com> 2.2.0-5 * Mon Feb 15 2016 Neil Horman <nhorman@redhat.com> 2.2.0-5
- Fix ftbfs isssue (1307431) - Fix ftbfs isssue (1307431)

22
enic-pun-fix.patch
View File

@ -1,22 +0,0 @@
diff -up ./dpdk-2.1.0/drivers/net/enic/enic_ethdev.c.enic ./dpdk-2.1.0/drivers/net/enic/enic_ethdev.c
--- ./dpdk-2.1.0/drivers/net/enic/enic_ethdev.c.enic 2015-08-17 13:35:37.000000000 -0400
+++ ./dpdk-2.1.0/drivers/net/enic/enic_ethdev.c 2015-08-26 10:33:17.953104878 -0400
@@ -348,13 +348,15 @@ static void enicpmd_dev_stop(struct rte_
{
struct rte_eth_link link;
struct enic *enic = pmd_priv(eth_dev);
+ uint64_t *dev_link_ptr = (uint64_t *)&eth_dev->data->dev_link;
+ uint64_t *link_ptr = (uint64_t *)&link;
ENICPMD_FUNC_TRACE();
enic_disable(enic);
memset(&link, 0, sizeof(link));
- rte_atomic64_cmpset((uint64_t *)&eth_dev->data->dev_link,
- *(uint64_t *)&eth_dev->data->dev_link,
- *(uint64_t *)&link);
+ rte_atomic64_cmpset(dev_link_ptr,
+ *dev_link_ptr,
+ *link_ptr);
}
/*