Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714185738233380"
MIME-Version: 1.0
Date: Sat, 27 Apr 2024 02:42:18 +0000
From: "Ryo ONODERA" <ryoon@netbsd.org>
Subject: CVS commit: pkgsrc/net/py-zmq
To: pkgsrc-changes@NetBSD.org
Reply-To: ryoon@netbsd.org
Message-Id: <20240427024218.DEEE4FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714185738233380
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	ryoon
Date:		Sat Apr 27 02:42:18 UTC 2024

Modified Files:
	pkgsrc/net/py-zmq: Makefile distinfo
Added Files:
	pkgsrc/net/py-zmq/patches: patch-CMakeLists.txt

Log Message:
net/py-zmq: Fix build under NetBSD at least

Wheel invokes cmake and it has no CMAKE_CONFIGURE_ARGS.
Then _zmq.so was reported as problematic RPATH.
Define CMAKE_SKIP_RPATH in CMakeLists.txt to fix this failure.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/py-zmq/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/py-zmq/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/py-zmq/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1714185738233380
Content-Disposition: inline
Content-Length: 2158
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/py-zmq/Makefile
diff -u pkgsrc/net/py-zmq/Makefile:1.41 pkgsrc/net/py-zmq/Makefile:1.42
--- pkgsrc/net/py-zmq/Makefile:1.41	Wed Apr 24 12:50:28 2024
+++ pkgsrc/net/py-zmq/Makefile	Sat Apr 27 02:42:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/04/24 12:50:28 adam Exp $
+# $NetBSD: Makefile,v 1.42 2024/04/27 02:42:18 ryoon Exp $
 
 DISTNAME=	pyzmq-26.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -15,7 +15,7 @@ TOOL_DEPENDS+=	${PYPKGPREFIX}-packaging-
 TOOL_DEPENDS+=	${PYPKGPREFIX}-scikit-build-core-[0-9]*:../../devel/py-scikit-build-core
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	cmake pkg-config
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 

Index: pkgsrc/net/py-zmq/distinfo
diff -u pkgsrc/net/py-zmq/distinfo:1.33 pkgsrc/net/py-zmq/distinfo:1.34
--- pkgsrc/net/py-zmq/distinfo:1.33	Wed Apr 24 12:50:28 2024
+++ pkgsrc/net/py-zmq/distinfo	Sat Apr 27 02:42:18 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.33 2024/04/24 12:50:28 adam Exp $
+$NetBSD: distinfo,v 1.34 2024/04/27 02:42:18 ryoon Exp $
 
 BLAKE2s (pyzmq-26.0.2.tar.gz) = a5a154d4e8550b1a29ba1f02e6df1232b21a131ce108d7b908e61d806035c027
 SHA512 (pyzmq-26.0.2.tar.gz) = d41e1ae6889795d28ea34cbced85d4711cfa5de9861338d542f12698e69a1bbcc545cffbda1b316c66791faeb60d359b7cf51552ef0b135fce951c431a99ad37
 Size (pyzmq-26.0.2.tar.gz) = 266712 bytes
+SHA1 (patch-CMakeLists.txt) = 5ba2d3ccbd7648132043f35615debaf450ee5bfb

Added files:

Index: pkgsrc/net/py-zmq/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/net/py-zmq/patches/patch-CMakeLists.txt:1.1
--- /dev/null	Sat Apr 27 02:42:18 2024
+++ pkgsrc/net/py-zmq/patches/patch-CMakeLists.txt	Sat Apr 27 02:42:18 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2024/04/27 02:42:18 ryoon Exp $
+
+* Fix _zmq.so build.
+
+--- CMakeLists.txt.orig	2024-04-27 02:25:29.115223723 +0000
++++ CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required(VERSION 3.14...3.28)
+ project(${SKBUILD_PROJECT_NAME} LANGUAGES C CXX)
+ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
++set(CMAKE_SKIP_RPATH TRUE)
+ 
+ list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ find_package(


--_----------=_1714185738233380--