Architecture specific change in rpms/dpdk.git

The package rpms/dpdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dpdk.git/commit/?id=b4b1e24f29589cee...
https://src.fedoraproject.org/cgit/rpms/dpdk.git/commit/?id=634d97f252f58b91....

Change:
+%ifarch x86_64 i686
+%ifarch x86_64 i686

Thanks.

Full change:
============

commit b4b1e24f29589cee5a609adac0e488af1260f2d5
Author: Neil Horman 
Date:   Thu Sep 27 16:13:07 2018 -0400

Resolves: bz 1548404

diff --git a/dpdk.spec b/dpdk.spec
index 1d833ae..4a4e68c 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -155,7 +155,9 @@ EXTRA_RPM_LDFLAGS=$(wdiff -3 -n ./noopts.txt ./opts.txt | sed -e"/^=+$/d" -e"/^
 rm -f obj.o

export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC %{_hardening_ldflags}"
+%ifarch x86_64 i686
 export EXTRA_CFLAGS="$EXTRA_CFLAGS -fcf-protection=full"
+%endif
 export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//g' -e's/-spec.*//')
 export HOST_EXTRA_CFLAGS="$EXTRA_CFLAGS $EXTRA_RPM_LDFLAGS"
 export EXTRA_HOST_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-spec.*//')

commit 8160c11c0bff28657f9e7d8d4fce4b3b397eb2c4
Author: Neil Horman 
Date:   Thu Sep 27 14:47:46 2018 -0400

Resolves: bz 1548404

diff --git a/dpdk.spec b/dpdk.spec
index 09e4485..1d833ae 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -122,9 +122,9 @@ as L2 and L3 forwarding.

%prep
 %setup -q -n dpdk-stable-%{version}
-%patch0 -p1 .pie
+%patch0 -p1 
 %ifarch x86_64 i686
-%patch1 -p1 .fcf
+%patch1 -p1
 %endif

%build

commit 634d97f252f58b9119d00ece3b646f148b79bd56
Author: Neil Horman 
Date:   Thu Sep 27 14:41:11 2018 -0400

Resolves: bz1548404

diff --git a/dpdk.spec b/dpdk.spec
index 99744ec..09e4485 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -122,7 +122,10 @@ as L2 and L3 forwarding.

%prep
 %setup -q -n dpdk-stable-%{version}
-%autopatch -p1
+%patch0 -p1 .pie
+%ifarch x86_64 i686
+%patch1 -p1 .fcf
+%endif

%build
 %set_build_flags

commit 29514aa1f7dc7b660f67202b1c9128b49b9b089a
Author: Neil Horman 
Date:   Thu Sep 27 14:25:08 2018 -0400

Resolves: bz 1548404

diff --git a/app-pie.patch b/app-pie.patch
new file mode 100644
index 0000000..5a6c7b0
--- /dev/null
+++ b/app-pie.patch
@@ -0,0 +1,12 @@
+diff -up ./mk/rte.app.mk.pie ./mk/rte.app.mk
+--- ./mk/rte.app.mk.pie	2018-09-24 16:03:22.504850668 -0400
++++ ./mk/rte.app.mk	2018-09-24 16:03:30.898814226 -0400
+@@ -50,7 +50,7 @@ LDSCRIPT = $(RTE_LDSCRIPT)
+ endif
+ 
+ # Link only the libraries used in the application
+-LDFLAGS += --as-needed
++LDFLAGS += --as-needed -pie
+ 
+ # default path for libs
+ _LDLIBS-y += -L$(RTE_SDK_BIN)/lib
diff --git a/dpdk.spec b/dpdk.spec
index f61b40d..99744ec 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,11 +9,13 @@

Name: dpdk
 Version: 17.11.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz

+Patch0: app-pie.patch
+Patch1: fcf-protection.patch

Summary: Set of libraries and drivers for fast packet processing

@@ -120,8 +122,10 @@ as L2 and L3 forwarding.

%prep
 %setup -q -n dpdk-stable-%{version}
+%autopatch -p1

%build
+%set_build_flags
 # set up a method for modifying the resulting .config file
 function setconf() {
    if grep -q ^$1= %{target}/.config; then
@@ -141,9 +145,16 @@ unset RTE_SDK RTE_INCLUDE RTE_TARGET
 # astoundingly convoluted in how it processes its linker flags.  Fixing it in
 # dpdk is the preferred solution, but adjusting to allow a gcc option in the
 # ldflags, even when gcc is used as the linker, requires large tree-wide changes
+touch obj.o
+gcc -### obj.o 2>&1 | awk '/.*collect2.*/ { print $0}' > ./noopts.txt
+gcc -### $(rpm --eval '%{build_ldflags}') obj.o 2>&1 | awk '/.*collect2.*/ {print $0}' > ./opts.txt
+EXTRA_RPM_LDFLAGS=$(wdiff -3 -n ./noopts.txt ./opts.txt | sed -e"/^=+$/d" -e"/^.*.res.*/d" -e"s/[-//g" -e"s/-]//g" -e"s/{+//g" -e"s/+}//g" -e"s//.*.o //g" -e"s/ /.*.o$//g" -e"s/-z .*//g" | tr '\n' ' ')
+rm -f obj.o
+
 export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC %{_hardening_ldflags}"
+export EXTRA_CFLAGS="$EXTRA_CFLAGS -fcf-protection=full"
 export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//g' -e's/-spec.*//')
-export HOST_EXTRA_CFLAGS=$EXTRA_CFLAGS
+export HOST_EXTRA_CFLAGS="$EXTRA_CFLAGS $EXTRA_RPM_LDFLAGS"
 export EXTRA_HOST_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-spec.*//')

# DPDK defaults to using builder-specific compiler flags.  However,
@@ -293,6 +304,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Thu Sep 27 2018 Neil Horman  - 2:17.11.2-3
+- quiet annocheck complaints (bz1548404)
+
 * Thu Jul 12 2018 Fedora Release Engineering  - 2:17.11.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

diff --git a/fcf-protection.patch b/fcf-protection.patch
new file mode 100644
index 0000000..ef6c414
--- /dev/null
+++ b/fcf-protection.patch
@@ -0,0 +1,12 @@
+diff -up ./mk/rte.lib.mk.stupid ./mk/rte.lib.mk
+--- ./mk/rte.lib.mk.stupid	2018-09-27 13:45:48.336632453 -0400
++++ ./mk/rte.lib.mk	2018-09-27 13:46:03.900563944 -0400
+@@ -103,7 +103,7 @@ ifneq ($(CC_SUPPORTS_Z),false)
+ NO_UNDEFINED := -z defs
+ endif
+ 
+-O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \
++O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) -fcf-protection=full \
+ 	  -shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(LIB) -o $(LIB)
+ O_TO_S_STR = $(subst ',''',$(O_TO_S)) #'# fix syntax highlight
+ O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)","  LD $(@)")