Merge pull request #57507 from xnox/zeromq-cmake

zeromq: switch from automake to cmake

Author: xnox

zeromq.yaml

@@ -1,18 +1,16 @@
 package:
   name: zeromq
   version: 4.3.5
-  epoch: 2
+  epoch: 3
   description: The ZeroMQ messaging library and tools
   copyright:
     - license: MPL-2.0
 
 environment:
   contents:
     packages:
-      - automake
       - build-base
-      - busybox
-      - ca-certificates-bundle
+      - libbsd-dev
       - libsodium-dev
       - perl
       - util-linux-dev
@@ -24,13 +22,17 @@ pipeline:
       expected-sha256: 6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
       uri: https://github.com/zeromq/libzmq/releases/download/v${{package.version}}/zeromq-${{package.version}}.tar.gz
 
-  - uses: autoconf/configure
+  - uses: patch
     with:
-      opts: --with-libsodium --disable-Werror
+      patches: 0001-cmake-add-curve_keygen-binary.patch
 
-  - uses: autoconf/make
+  - uses: cmake/configure
+    with:
+      opts: -DENABLE_CURVE=ON -DWITH_LIBSODIUM=ON
+
+  - uses: cmake/build
 
-  - uses: autoconf/make-install
+  - uses: cmake/install
 
   - uses: strip
 
@@ -78,14 +80,6 @@ subpackages:
             pkg-config libzmq --cflags
             pkg-config libzmq --libs
 
-  - name: zeromq-doc
-    pipeline:
-      - uses: split/manpages
-    description: zeromq manpages
-    test:
-      pipeline:
-        - uses: test/docs
-
 update:
   enabled: true
   github:

zeromq/0001-cmake-add-curve_keygen-binary.patch

@@ -0,0 +1,30 @@
+From dacde1f11aa4fcbf7571ea520e7b1b8ccee154ec Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <[email protected]>
+Date: Wed, 25 Jun 2025 17:42:39 +0100
+Subject: [PATCH] cmake: add curve_keygen binary
+
+When sodium is enabled, also build curve_keygen binary. This is to
+bring cmake builds to parity with autoconf.
+
+Fixes: https://github.com/zeromq/libzmq/issues/4675
+---
+ CMakeLists.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ab2259e..7caf2c87 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1915,3 +1915,9 @@ if(ENABLE_NO_EXPORT)
+   message(STATUS "Building with empty ZMQ_EXPORT macro")
+   add_definitions(-DZMQ_NO_EXPORT)
+ endif()
++
++if (ENABLE_CURVE)
++  add_executable(curve_keygen tools/curve_keygen.cpp)
++  target_link_libraries(curve_keygen libzmq)
++  install(TARGETS curve_keygen RUNTIME DESTINATION bin)
++endif()
+-- 
+2.48.1
+