numad: 0.5 -> 0.5-unstable-2023-09-06 (#315168)

This commit is contained in:
Vincent Vanlaer
2024-07-14 12:33:38 +02:00
committed by GitHub
parent 1a8e33d451
commit bdf5d0a3be
2 changed files with 13 additions and 43 deletions
+13 -10
View File
@@ -1,26 +1,29 @@
{ lib, stdenv, fetchgit }:
{ lib, stdenv, fetchgit, unstableGitUpdater, writeShellScript }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "numad";
version = "0.5";
version = "0.5-unstable-2023-09-06";
src = fetchgit {
url = "https://pagure.io/numad.git";
rev = "334278ff3d774d105939743436d7378a189e8693";
sha256 = "sha256-6nrbfooUI1ufJhsPf68li5584oKQcznXQlxfpStuX5I=";
rev = "3399d89305b6560e27e70aff4ad9fb403dedf947";
sha256 = "sha256-USEffVcakaAbilqijJmpro92ujvxbglcXxyBlntMxaI=";
};
hardeningDisable = [ "format" ];
patches = [
./numad-linker-flags.patch
];
postPatch = ''
substituteInPlace Makefile --replace "install -m" "install -Dm"
'';
makeFlags = [ "prefix=$(out)" ];
passthru.updateScript = unstableGitUpdater {
tagConverter = writeShellScript "tagConverter" ''
read tag
test "$tag" = "0" \
&& tag=0.5; echo "$tag"
'';
};
meta = with lib; {
description = "User-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource access";
mainProgram = "numad";
@@ -1,33 +0,0 @@
From 9eb3cc5c51d846c8c8b750a4eb55545d7b5fea6c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 23 Apr 2014 15:41:26 -0400
Subject: [PATCH] use LDLIBS for linker flags
When you put -lfoo into the dependency line of make, it forces it to
search /lib and /usr/lib for files to link against. This can cause
problems when trying to cross-compile or build for different ABIs.
Use the standard LDLIBS variable instead.
URL: https://bugs.gentoo.org/505760
Reported-by: Georgi Georgiev <chutzimir@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index f3838b4..f2e9a6e 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,8 @@ docdir := ${prefix}/share/doc
all: numad
-numad: numad.o -lpthread
+LDLIBS := -lpthread
+numad: numad.o
AR ?= ar
RANLIB ?= ranlib
--
1.9.2