git: 53705c8b604a - main - devel/sdbus-cpp: unbreak pkg-config support
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 05 Sep 2023 09:00:04 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=53705c8b604a4ccc55220a9b742aa5a9324c4124
commit 53705c8b604a4ccc55220a9b742aa5a9324c4124
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-09-05 07:49:17 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-09-05 08:58:49 +0000
devel/sdbus-cpp: unbreak pkg-config support
$ pkg-config --libs sdbus-c++
Package libsystemd was not found in the pkg-config search path.
Perhaps you should add the directory containing `libsystemd.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libsystemd', required by 'sdbus-c++', not found
---
devel/sdbus-cpp/Makefile | 1 +
devel/sdbus-cpp/files/patch-basu | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/devel/sdbus-cpp/Makefile b/devel/sdbus-cpp/Makefile
index 660beb7d2f71..623c2cd39ac0 100644
--- a/devel/sdbus-cpp/Makefile
+++ b/devel/sdbus-cpp/Makefile
@@ -1,6 +1,7 @@
PORTNAME= sdbus-cpp
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= jbeich@FreeBSD.org
diff --git a/devel/sdbus-cpp/files/patch-basu b/devel/sdbus-cpp/files/patch-basu
index b31aa3a37623..c0fd46fa455d 100644
--- a/devel/sdbus-cpp/files/patch-basu
+++ b/devel/sdbus-cpp/files/patch-basu
@@ -1,17 +1,24 @@
libsystemd is Linux-only, so replace with basu
---- CMakeLists.txt.orig 2021-12-22 12:17:31 UTC
+--- CMakeLists.txt.orig 2023-08-20 09:45:44 UTC
+++ CMakeLists.txt
-@@ -16,7 +16,7 @@ option(BUILD_LIBSYSTEMD "Build libsystemd static libra
+@@ -12,13 +12,13 @@ include(GNUInstallDirs) # Installation directories for
+ # PERFORMING CHECKS & PREPARING THE DEPENDENCIES
+ #-------------------------------
+
+-set(LIBSYSTEMD "libsystemd")
++set(LIBSYSTEMD "basu")
+
+ option(BUILD_LIBSYSTEMD "Build libsystemd static library and incorporate it into libsdbus-c++" OFF)
if(NOT BUILD_LIBSYSTEMD)
find_package(PkgConfig REQUIRED)
- pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libsystemd>=236)
+ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu)
if(NOT TARGET PkgConfig::Systemd)
- message(FATAL_ERROR "libsystemd of version at least 236 is required, but was not found "
- "(if you have systemd in your OS, you may want to install package containing pkgconfig "
-@@ -25,8 +25,7 @@ if(NOT BUILD_LIBSYSTEMD)
+ message(WARNING "libsystemd not found, checking for libelogind instead")
+ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=236)
+@@ -36,8 +36,7 @@ if(NOT BUILD_LIBSYSTEMD)
"and incorporate libsystemd as embedded library within sdbus-c++)")
endif()
add_library(Systemd::Libsystemd ALIAS PkgConfig::Systemd)