pktgen: 19.12.0 -> 21.05.0

This commit is contained in:
Jörg Thalheim 2021-05-24 08:40:49 +02:00
parent 00a7a0f609
commit 9d002b110e
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4
2 changed files with 14 additions and 27 deletions

View file

@ -1,17 +0,0 @@
1. librte_process_info does not exist.
2. lua5.3 library is liblua.
3. app/meson.build uses undeclared drivers_install_subdir.
--- a/lib/common/meson.build
+++ b/lib/common/meson.build
@@ -34,1 +34,1 @@
-libs = ['eal', 'kvargs', 'cmdline', 'process_info']
+libs = ['eal', 'kvargs', 'cmdline']
--- a/lib/lua/meson.build
+++ b/lib/lua/meson.build
@@ -31 +31 @@ endforeach
-ext_deps += cc.find_library('lua5.3', required: true)
+ext_deps += cc.find_library('lua', required: true)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -0,0 +1,1 @@
+option('drivers_install_subdir', type: 'string', value: '')

View file

@ -1,29 +1,33 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config
, dpdk, libbsd, libpcap, lua5_3, numactl, util-linux
, gtk2, which, withGtk ? false
}:
stdenv.mkDerivation rec {
pname = "pktgen";
version = "19.12.0";
version = "21.05.0";
src = fetchurl {
url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/${pname}-${version}.tar.xz";
sha256 = "1clfviz1qa4hysslcg6i29vsxwl9f6j1y7zf9wwx9br3yq08x956";
src = fetchFromGitHub {
owner = "pktgen";
repo = "Pktgen-DPDK";
rev = "pktgen-${version}";
sha256 = "sha256-7lLDtbd14olEHO+1BuI6KTEUNRM/zAyRXau/OZbYbGA=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs =
[ dpdk libbsd libpcap lua5_3 numactl which ]
++ lib.optionals withGtk [gtk2];
buildInputs = [
dpdk libbsd libpcap lua5_3 numactl which
] ++ lib.optionals withGtk [
gtk2
];
RTE_SDK = dpdk;
GUI = lib.optionalString withGtk "true";
NIX_CFLAGS_COMPILE = "-msse3";
patches = [ ./configure.patch ];
# requires symbols from this file
NIX_LDFLAGS = "-lrte_net_bond";
postPatch = ''
substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${util-linux}/bin/lscpu