Star0
33
代码
代码
Issues20
Pull Requests13
项目讨论
Wiki
分析
Star0
33
已开启
fix(dpdk.spec): Fix compilation issue in dpdk.spec #808
xuqing14创建于 6月27日
fix(dpdk.spec): Fix compilation issue in dpdk.spec #808
已开启
xuqing14创建于 6月27日
从xuqing14/dpdkopenEuler-24.03-LTS-SP3合入到src-openeuler/dpdkopenEuler-24.03-LTS-SP3
共 1 个文件变更+5-4
Mdpdk.spec+5-4
@@ -296,7 +296,8 @@ export GAZELLE_LIBS="-lrte_pci -lrte_bus_pci -lrte_cmdline -lrte_hash -lrte_memp
296export GAZELLE_LIBS="-lrte_pci -lrte_bus_pci -lrte_cmdline -lrte_hash -lrte_mempool -lrte_mempool_ring -lrte_timer -lrte_eal -lrte_gro -lrte_ring -lrte_mbuf -lrte_telemetry -lrte_net_ixgbe -lrte_kvargs -lrte_net_hinic -lrte_net_i40e -lrte_net_virtio -lrte_bus_vdev -lrte_net -lrte_rcu -lrte_ethdev -lrte_pdump -lrte_bpf -lrte_security -lrte_cryptodev -lrte_net_pcap -lrte_metrics"296export GAZELLE_LIBS="-lrte_pci -lrte_bus_pci -lrte_cmdline -lrte_hash -lrte_mempool -lrte_mempool_ring -lrte_timer -lrte_eal -lrte_gro -lrte_ring -lrte_mbuf -lrte_telemetry -lrte_net_ixgbe -lrte_kvargs -lrte_net_hinic -lrte_net_i40e -lrte_net_virtio -lrte_bus_vdev -lrte_net -lrte_rcu -lrte_ethdev -lrte_pdump -lrte_bpf -lrte_security -lrte_cryptodev -lrte_net_pcap -lrte_metrics"
297%endif297%endif
298export SECURE_OPTIONS="-fstack-protector-strong -D_FORTIFY_SOURCE=2 -O2 -Wall -Wl,-z,relro,-z,now,-z,noexecstack -Wtrampolines -fPIE -pie -fPIC -g"298export SECURE_OPTIONS="-fstack-protector-strong -D_FORTIFY_SOURCE=2 -O2 -Wall -Wl,-z,relro,-z,now,-z,noexecstack -Wtrampolines -fPIE -pie -fPIC -g"
299-gcc -o gazelle-pdump ${GAZELLE_FLAGS} ${SOCURE_OPTIONS} -L../../drivers -L../../lib ${GAZELLE_LIBS} pdump_main.c.o299+# BUG: SOCURE_OPTIONS 拼写错误，安全编译选项未生效
300+gcc -o gazelle-pdump ${GAZELLE_FLAGS} ${SECURE_OPTIONS} -L../../drivers -L../../lib ${GAZELLE_LIBS} pdump_main.c.o
300cd -301cd -
301 302 
302%install303%install
@@ -320,9 +321,9 @@ cp ./%{_vpath_builddir}/examples/dpdk-ethtool $RPM_BUILD_ROOT/%{_bindir}
320cp ./%{_vpath_builddir}/examples/dpdk-dma $RPM_BUILD_ROOT/%{_bindir}321cp ./%{_vpath_builddir}/examples/dpdk-dma $RPM_BUILD_ROOT/%{_bindir}
321cp ./%{_vpath_builddir}/examples/dpdk-ptpclient $RPM_BUILD_ROOT/%{_bindir}322cp ./%{_vpath_builddir}/examples/dpdk-ptpclient $RPM_BUILD_ROOT/%{_bindir}
322 323 
323-# move pmd so files in dpdk-pmds directory to /usr/lib64.324+# move pmd so files in dpdk-pmds directory to %{_libdir}.
324-# so files in ddpk-pdms directory are loaded by default. remove it to prevent unnecessary so load. 325+# BUG: 硬编码 /usr/lib64 在 i686 等架构上路径错误
325-mv -f $RPM_BUILD_ROOT/%{pmddir}/* $RPM_BUILD_ROOT/usr/lib64/326+mv -f $RPM_BUILD_ROOT/%{pmddir}/* $RPM_BUILD_ROOT%{_libdir}/
326ln -fs %{_bindir}/dpdk-devbind.py $RPM_BUILD_ROOT/%{_bindir}/dpdk-devbind327ln -fs %{_bindir}/dpdk-devbind.py $RPM_BUILD_ROOT/%{_bindir}/dpdk-devbind
327strip -g $RPM_BUILD_ROOT/lib/modules/%{kern_devel_ver}/extra/dpdk/igb_uio.ko328strip -g $RPM_BUILD_ROOT/lib/modules/%{kern_devel_ver}/extra/dpdk/igb_uio.ko
328 329