odp-dpdk: 1.22.0.0_DPDK_18.11 -> 1.27.0.0_DPDK_19.11
This commit is contained in:
parent
9d002b110e
commit
b50d58d988
|
@ -1,21 +1,21 @@
|
||||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config
|
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config
|
||||||
, dpdk, libconfig, libpcap, numactl, openssl, zlib, libbsd, libelf, jansson
|
, dpdk, libbpf, libconfig, libpcap, numactl, openssl, zlib, libbsd, libelf, jansson
|
||||||
}: let
|
}: let
|
||||||
dpdk_18_11 = dpdk.overrideAttrs (old: rec {
|
dpdk_19_11 = dpdk.overrideAttrs (old: rec {
|
||||||
version = "18.11.5";
|
version = "19.11";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
|
url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
|
||||||
sha256 = "1n6nfaj7703l19jcw540lm8avni48hj9q1rq4mfp8b8gd4zjprj0";
|
sha256 = "sha256-RnEzlohDZ3uxwna7dKNFiqfAAswh4pXFHjvWVJexEqs=";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "odp-dpdk";
|
pname = "odp-dpdk";
|
||||||
version = "1.22.0.0_DPDK_18.11";
|
version = "1.27.0.0_DPDK_19.11";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz";
|
url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1m8xhmfjqlj2gkkigq5ka3yh0xgzrcpfpaxp1pnh8d1g99094vbx";
|
sha256 = "sha256-/4m2NqnEXyenNUrCq3c2ozJzPWFFs/Qp7MAVm9B2biA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
dpdk_18_11
|
dpdk_19_11
|
||||||
libconfig
|
libconfig
|
||||||
libpcap
|
libpcap
|
||||||
numactl
|
numactl
|
||||||
|
@ -32,19 +32,9 @@ in stdenv.mkDerivation rec {
|
||||||
libbsd
|
libbsd
|
||||||
libelf
|
libelf
|
||||||
jansson
|
jansson
|
||||||
|
libbpf
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
|
|
||||||
|
|
||||||
# for some reason, /build/odp-dpdk-1.22.0.0_DPDK_18.11/lib/.libs ends up in all binaries,
|
|
||||||
# while it should be $out/lib instead.
|
|
||||||
# prepend rpath with the proper location, the /build will get removed during rpath shrinking
|
|
||||||
preFixup = ''
|
|
||||||
for prog in $out/bin/*; do
|
|
||||||
patchelf --set-rpath $out/lib:`patchelf --print-rpath $prog` $prog
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
# binaries will segfault otherwise
|
# binaries will segfault otherwise
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue