[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#73378] [PATCH] gnu: rapidcheck: Fix pkg-config libs.
From: |
Liliana Marie Prikler |
Subject: |
[bug#73378] [PATCH] gnu: rapidcheck: Fix pkg-config libs. |
Date: |
Fri, 20 Sep 2024 12:00:51 +0200 |
Using rapidcheck as a dependency in a project currently results in a linker
error, because the pkg-config file is missing relevant linker flags.
* gnu/packages/patches/rapidcheck-fix-libs.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/check.scm (rapidcheck)[patches]: Use it here.
---
gnu/local.mk | 1 +
gnu/packages/check.scm | 1 +
.../patches/rapidcheck-fix-libs.patch | 27 +++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 100644 gnu/packages/patches/rapidcheck-fix-libs.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index a092122d22..5d0b8a37bb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2070,6 +2070,7 @@ dist_patch_DATA =
\
%D%/packages/patches/qtwayland-cleanup-callbacks.patch \
%D%/packages/patches/ragel-char-signedness.patch \
%D%/packages/patches/randomjungle-disable-static-build.patch \
+ %D%/packages/patches/rapidcheck-fix-libs.patch \
%D%/packages/patches/raptor2-heap-overflow.patch \
%D%/packages/patches/ratpoints-sturm_and_rp_private.patch \
%D%/packages/patches/ratpoison-shell.patch \
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 656a2e1730..42554102ac 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3756,6 +3756,7 @@ (define-public rapidcheck
(sha256
(base32 "1s2qva1amhs887jcdj12ppxk9kkfvy25xy7vzhkwb7rljr3gj713"))
(modules '((guix build utils)))
+ (patches (search-patches "rapidcheck-fix-libs.patch"))
(snippet
#~(begin
(make-file-writable "ext/CMakeLists.txt")
diff --git a/gnu/packages/patches/rapidcheck-fix-libs.patch
b/gnu/packages/patches/rapidcheck-fix-libs.patch
new file mode 100644
index 0000000000..5e5603116c
--- /dev/null
+++ b/gnu/packages/patches/rapidcheck-fix-libs.patch
@@ -0,0 +1,27 @@
+From c4f558b0990571759fdaf976eb35ee1eb0d934a0 Mon Sep 17 00:00:00 2001
+From: Robert Hensing <robert@roberthensing.nl>
+Date: Tue, 25 Jun 2024 20:57:41 +0200
+Subject: [PATCH] Add -lrapidcheck to pkg-config module
+
+This adds the library to rapidcheck.pc, so that it doesn't have
+to be specified manually in projects that consume it.
+
+The other modules don't need it because they have rapidcheck in
+their Requires field.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d55fdc51..046df2fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,7 +128,7 @@ set(PKG_CONFIG_DESCRIPTION_SUMMARY "C++ framework for
property based testing ins
+ set(PKG_CONFIG_VERSION)
+ set(PKG_CONFIG_LIBDIR "\${prefix}/lib")
+ set(PKG_CONFIG_INCLUDEDIR "\${prefix}/include")
+-set(PKG_CONFIG_LIBS)
++set(PKG_CONFIG_LIBS "-L\${libdir} -lrapidcheck")
+ set(PKG_CONFIG_CFLAGS "-I\${includedir}")
+
+ configure_file(
base-commit: e9d903f146865db5948abd271a5c7e763681b4e9
--
2.46.0
- [bug#73378] [PATCH] gnu: rapidcheck: Fix pkg-config libs.,
Liliana Marie Prikler <=