nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #269612 from helsinki-systems/upd/lvm2

Browse Source 
lvm2: 2.03.22 -> 2.03.23
This commit is contained in:
7c6f434c 2024-01-07 11:17:10 +00:00 committed by GitHub
commit 11f2d0ffe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/lvm2/2_03.nix
View File

@ -1,4 +1,4 @@
import ./common.nix {
version = "2.03.22";
hash = "sha256-TFppI70aznzgRHRgioSTfOBTupGxrOnwsAFyaOcy3Hw=";
version = "2.03.23";
hash = "sha256-dOeUqene4bz4ogZfZbkZbET98yHiLWO5jtfejJqhel0=";
}

4
pkgs/os-specific/linux/lvm2/common.nix
View File

@ -103,8 +103,8 @@ stdenv.mkDerivation rec {
}))
# Musl fix from Alpine
./fix-stdio-usage.patch
] ++ lib.optionals stdenv.hostPlatform.isStatic [
./no-shared.patch
# https://gitlab.com/lvmteam/lvm2/-/merge_requests/8
./fix-static.patch
];
doCheck = false; # requires root

28
pkgs/os-specific/linux/lvm2/fix-static.patch Normal file
View File

@ -0,0 +1,28 @@
From 0cbe7f0adc86c92c61156c417b27b063f156b31b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 2 Jan 2024 18:15:20 +0100
Subject: [PATCH] makefiles: fix disabling shared link
LIB_SHARED still gets set when shared linking has been disabled, so
the previous version of this check still attempted to build the
shared library.
---
libdm/make.tmpl.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index 2dd9625d4d..69ba2c35ab 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -436,7 +436,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
@echo " [CC] $(<F)"
$(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
-ifneq (,$(LIB_SHARED))
+ifeq ("@SHARED_LINK@", "yes")
TARGETS += $(LIB_SHARED).$(LIB_VERSION)
$(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
--
GitLab

46
pkgs/os-specific/linux/lvm2/no-shared.patch
View File

@ -1,46 +0,0 @@
diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 2758648e6..f305a12b0 100644
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -47,7 +47,6 @@ endif
LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_DM)
-TARGETS = libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) .symver_check
CFLOW_LIST = $(SOURCES)
CFLOW_LIST_TARGET = libdevmapper.cflow
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index a731687c2..9366cdf1c 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -314,7 +314,7 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow)
SUBDIRS.clean := $(SUBDIRS:=.clean)
SUBDIRS.distclean := $(SUBDIRS:=.distclean)
-TARGETS += $(LIB_SHARED) $(LIB_STATIC)
+TARGETS += $(LIB_STATIC)
all: $(SUBDIRS) $(TARGETS)
@@ -431,7 +431,6 @@ DEFS+=-D_FILE_OFFSET_BITS=64
ifneq (,$(LIB_SHARED))
-TARGETS += $(LIB_SHARED).$(LIB_VERSION)
$(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
@echo " [CC] $@"
ifeq ("@LIB_SUFFIX@","so")
diff --git a/make.tmpl.in b/make.tmpl.in
index b73176f5a..6100d0dfd 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -368,7 +368,7 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow)
SUBDIRS.clean := $(SUBDIRS:=.clean)
SUBDIRS.distclean := $(SUBDIRS:=.distclean)
-TARGETS += $(LIB_SHARED) $(LIB_STATIC)
+TARGETS += $(LIB_STATIC)
INTERNAL_LIBS = \
$(top_builddir)/libdaemon/client/libdaemonclient.a \