Fix multilib issue, different outputs on different arches

This commit is contained in:
Than Ngo 2019-09-11 13:27:40 +02:00
parent 94c6a75957
commit 295ae64736
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up dpdk-stable-18.11.2/mk/rte.sdkdoc.mk.multilib dpdk-stable-18.11.2/mk/rte.sdkdoc.mk
--- dpdk-stable-18.11.2/mk/rte.sdkdoc.mk.multilib 2019-09-11 12:01:46.491478717 +0200
+++ dpdk-stable-18.11.2/mk/rte.sdkdoc.mk 2019-09-11 12:49:19.100816161 +0200
@@ -48,7 +48,7 @@ api-html: $(API_EXAMPLES)
-e "s|@OUTPUT@|$(RTE_OUTPUT)/doc|" \
-e "s|@HTML_OUTPUT@|html/api|" \
-e "s|@TOPDIR@|./|g" \
- -e "s|@STRIP_FROM_PATH@|./|g" \
+ -e "s|@STRIP_FROM_PATH@|$(RTE_SDK) $(RTE_OUTPUT)/doc/html/|" \
$(RTE_SDK)/doc/api/doxy-api.conf.in)| \
doxygen -
$(Q)$(RTE_SDK)/doc/api/doxy-html-custom.sh $(RTE_OUTPUT)/doc/html/api/doxygen.css

View File

@ -9,7 +9,7 @@
Name: dpdk
Version: 18.11.2
Release: 3%{?dist}
Release: 4%{?dist}
Epoch: 2
URL: http://dpdk.org
Source: https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
@ -17,6 +17,8 @@ Source: https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
Patch0: app-pie.patch
Patch1: fcf-protection.patch
Patch2: dpdk-rte-ether-align.patch
# fixed multilib issue with doxygen
Patch3: dpdk-stable-18.11.2-doxygen-multilib.patch
Summary: Set of libraries and drivers for fast packet processing
@ -128,6 +130,7 @@ as L2 and L3 forwarding.
%patch1 -p1
%endif
%patch2 -p1
%patch3 -p1
%build
%set_build_flags
@ -316,6 +319,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
%endif
%changelog
* Wed Sep 11 2019 Than Ngo <than@redhat.com> - 2:18.11.2-4
- Fix multilib issue, different outputs on different arches
* Mon Aug 26 2019 Neil Horman <nhorman@redhat.com> - 2:18.11.2-3
- Fix csh syntax in dpdk-sdk-x86_64.csg (bz1742942)