gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vpp: 25.10 -> 26.02 (#507172)

Browse Source
This commit is contained in:
Austin Horstman
2026-04-09 04:04:41 +00:00
committed by GitHub
parent 7df60e26ae 5e2a420f36
commit 47fae20691
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/vp/vpp/package.nix
+2 -5
View File
@@ -50,13 +50,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "vpp";
version = "25.10";
version = "26.02";
src = fetchFromGitHub {
owner = "FDio";
repo = "vpp";
tag = "v${finalAttrs.version}";
hash = "sha256-J+aJXzq9jKzcFKpUNBskX3KccwKtZhK+m8NTbrGjsXw=";
hash = "sha256-z9yh1ZMP28SSzHNBdO7UnvVqsIqtXUcwYZUH1UdBUB0=";
};
postPatch = ''
@@ -78,9 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/src";
enableParallelBuilding = true;
# -Wno-incompatible-pointer-types can be removed in 26.02 (https://github.com/NixOS/nixpkgs/pull/479794)
env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized -Wno-incompatible-pointer-types";
cmakeFlags = [
"-DVPP_PLATFORM=default"
"-DVPP_LIBRARY_DIR=lib"
pkgs/by-name/vp/vpp/use-dynamic-libs.patch
+12 -5
View File
@@ -14,14 +14,21 @@
--- a/plugins/rdma/CMakeLists.txt
+++ b/plugins/rdma/CMakeLists.txt
@@ -18,8 +18,8 @@ if (NOT IBVERBS_INCLUDE_DIR)
@@ -18,7 +18,7 @@ if (NOT IBVERBS_INCLUDE_DIR)
return()
endif()
-vpp_plugin_find_library(rdma IBVERBS_LIB libibverbs.a)
-vpp_plugin_find_library(rdma MLX5_LIB libmlx5.a)
+vpp_plugin_find_library(rdma IBVERBS_LIB ibverbs)
+vpp_plugin_find_library(rdma MLX5_LIB mlx5)
if (NOT IBVERBS_LIB)
vpp_plugin_find_library(rdma IBVERBS_LIB libibverbs.so)
if (NOT IBVERBS_LIB)
@@ -28,7 +28,7 @@ if (NOT IBVERBS_LIB)
message(WARNING "-- linking rdma plugin against ibverbs shared libs")
endif()
if (NOT IBVERBS_LIB OR NOT MLX5_LIB)
message(WARNING "rdma plugin - ibverbs not found - rdma plugin disabled")
-vpp_plugin_find_library(rdma MLX5_LIB libmlx5.a)
+vpp_plugin_find_library(rdma MLX5_LIB mlx5)
if (MLX5_LIB)
string_append(RDMA_LINK_FLAGS "-Wl,--whole-archive,${MLX5_LIB},--no-whole-archive -Wl,--exclude-libs,ALL")
else()