Skip to content

Commit 0bdd6b3

Browse files
author
Anthony Mallet
committed
[mk/sysdep] Fix cppzmp search for debian<12 or ubuntu<24
cppzmq is not really packaged on debian<12 and ubuntu<24 but rather partially included in libzmq. Make some files optional in SYSTEM_SEARCH in order to support this. While here, add package hints.
1 parent cce3615 commit 0bdd6b3

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

mk/sysdep/cppzmq.mk

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,18 @@ DEPEND_USE+= cppzmq
1717

1818
DEPEND_ABI.cppzmq?= cppzmq
1919

20+
# ubuntu<24 and debian<12 bundle the header inside libzmq-dev, so mark the
21+
# cmake and pkg-config file as optional. If found, they will still serve
22+
# setting the cmake and pkg-config paths correctly.
23+
#
2024
SYSTEM_SEARCH.cppzmq=\
2125
'include/zmq.hpp' \
22-
'share/cmake/cppzmq/cppzmqConfig.cmake' \
23-
'lib/pkgconfig/cppzmq.pc:/Version/s/[^0-9.]//gp'
26+
'share/cmake/cppzmq/cppzmqConfig.cmake:::~' \
27+
'lib/pkgconfig/cppzmq.pc:/Version/s/[^0-9.]//gp::~'
28+
29+
SYSTEM_PKG.Debian.cppzmq= cppzmq-dev
30+
SYSTEM_PKG.NetBSD.cppzmq= net/cppzmq
31+
SYSTEM_PKG.RedHat.cppzmq= cppzmq-devel
2432

2533
endif # CPPZMQ_DEPEND_MK ---------------------------------------------------
2634

0 commit comments

Comments
 (0)