CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Wed, 13 Dec 2023 17:39:07 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Dec 13 17:39:07 UTC 2023

Modified Files:
        pkgsrc/chat/matrix-synapse: Makefile
        pkgsrc/devel/py-rpds-py: Makefile
        pkgsrc/editors/helix: Makefile
        pkgsrc/lang/py-libcst: Makefile
        pkgsrc/lang/rust: cargo.mk
        pkgsrc/security/py-bcrypt: Makefile
        pkgsrc/security/py-cryptography: Makefile

Log Message:
cargo.mk: centralize Darwin -install_name workaround.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/chat/matrix-synapse/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-rpds-py/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/editors/helix/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/py-libcst/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/rust/cargo.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/py-bcrypt/Makefile
cvs rdiff -u -r1.106 -r1.107 pkgsrc/security/py-cryptography/Makefile

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

Modified files:

Index: pkgsrc/chat/matrix-synapse/Makefile
diff -u pkgsrc/chat/matrix-synapse/Makefile:1.86 pkgsrc/chat/matrix-synapse/Makefile:1.87
--- pkgsrc/chat/matrix-synapse/Makefile:1.86    Wed Nov  1 23:05:04 2023
+++ pkgsrc/chat/matrix-synapse/Makefile Wed Dec 13 17:39:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2023/11/01 23:05:04 gdt Exp $
+# $NetBSD: Makefile,v 1.87 2023/12/13 17:39:06 schmonz Exp $
 
 DISTNAME=      matrix-synapse-1.95.1
 CATEGORIES=    chat
@@ -109,14 +109,6 @@ post-install:
        ${INSTALL_DATA} files/README.pkgsrc.txt ${DESTDIR}${DOCDIR}
        ${INSTALL_DATA} files/README.pkgsrc.NetBSD.txt ${DESTDIR}${DOCDIR}
 
-.if ${OPSYS} == "Darwin"
-post-install: fix-rpath
-.PHONY: fix-rpath
-fix-rpath:
-       install_name_tool -id ${PREFIX}/${PYSITELIB}/synapse/synapse_rust.abi3.so \
-       ${DESTDIR}${PREFIX}/${PYSITELIB}/synapse/synapse_rust.abi3.so
-.endif
-
 # \todo Grok upstream's new test scheme and port to it.
 # test status as of 1.51.0
 # 51 warnings, 1 error

Index: pkgsrc/devel/py-rpds-py/Makefile
diff -u pkgsrc/devel/py-rpds-py/Makefile:1.9 pkgsrc/devel/py-rpds-py/Makefile:1.10
--- pkgsrc/devel/py-rpds-py/Makefile:1.9        Thu Nov 30 09:23:07 2023
+++ pkgsrc/devel/py-rpds-py/Makefile    Wed Dec 13 17:39:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/11/30 09:23:07 adam Exp $
+# $NetBSD: Makefile,v 1.10 2023/12/13 17:39:06 schmonz Exp $
 
 DISTNAME=      rpds_py-0.13.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -14,13 +14,6 @@ TOOL_DEPENDS+=       ${PYPKGPREFIX}-maturin>=1
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-post-install:
-       install_name_tool -id ${PREFIX}/${PYSITELIB}/rpds/rpds.so \
-       ${DESTDIR}${PREFIX}/${PYSITELIB}/rpds/rpds.so
-.endif
-
 .include "cargo-depends.mk"
 
 .include "../../lang/python/wheel.mk"

Index: pkgsrc/editors/helix/Makefile
diff -u pkgsrc/editors/helix/Makefile:1.10 pkgsrc/editors/helix/Makefile:1.11
--- pkgsrc/editors/helix/Makefile:1.10  Tue Oct 24 22:09:01 2023
+++ pkgsrc/editors/helix/Makefile       Wed Dec 13 17:39:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/10/24 22:09:01 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2023/12/13 17:39:06 schmonz Exp $
 
 GITHUB_PROJECT=        helix
 DISTNAME=      22.12
@@ -41,6 +41,7 @@ SUBST_SED.datadir+=   -e 's,%%DATADIR%%,${
 post-build:
        ${RUN} cd ${WRKSRC} && env HELIX_RUNTIME=${WRKSRC}/runtime \
                ./target/release/hx --grammar build
+# not under ${PREFIX}/lib, or else lang/rust/cargo.mk would handle it
 .if ${OPSYS} == "Darwin"
        ${RUN} cd ${WRKSRC}/runtime/grammars &&                         \
        for f in *.so; do                                               \

Index: pkgsrc/lang/py-libcst/Makefile
diff -u pkgsrc/lang/py-libcst/Makefile:1.9 pkgsrc/lang/py-libcst/Makefile:1.10
--- pkgsrc/lang/py-libcst/Makefile:1.9  Sat Oct  7 20:14:31 2023
+++ pkgsrc/lang/py-libcst/Makefile      Wed Dec 13 17:39:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/10/07 20:14:31 adam Exp $
+# $NetBSD: Makefile,v 1.10 2023/12/13 17:39:07 schmonz Exp $
 
 DISTNAME=      libcst-1.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -30,13 +30,6 @@ pre-build:
 
 CHECK_WRKREF_SKIP+=    ${PYSITELIB}/libcst/native.so
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-post-install:
-       install_name_tool -id ${PREFIX}/${PYSITELIB}/libcst/native.so \
-       ${DESTDIR}${PREFIX}/${PYSITELIB}/libcst/native.so
-.endif
-
 .include "cargo-depends.mk"
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/lang/rust/cargo.mk
diff -u pkgsrc/lang/rust/cargo.mk:1.35 pkgsrc/lang/rust/cargo.mk:1.36
--- pkgsrc/lang/rust/cargo.mk:1.35      Tue May 16 06:10:52 2023
+++ pkgsrc/lang/rust/cargo.mk   Wed Dec 13 17:39:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.35 2023/05/16 06:10:52 wiz Exp $
+# $NetBSD: cargo.mk,v 1.36 2023/12/13 17:39:06 schmonz Exp $
 #
 # Common logic that can be used by packages that depend on cargo crates
 # from crates.io. This lets existing pkgsrc infrastructure fetch and verify
@@ -97,3 +97,13 @@ do-cargo-install:
        # remove files cargo uses for tracking installations
        ${RM} -f ${DESTDIR}${PREFIX}/.crates.toml
        ${RM} -f ${DESTDIR}${PREFIX}/.crates2.json
+
+.if ${OPSYS} == "Darwin"
+.PHONY: do-cargo-post-install-darwin-fix-rpath
+post-install: do-cargo-post-install-darwin-fix-rpath
+do-cargo-post-install-darwin-fix-rpath:
+       ${RUN} cd ${DESTDIR};                                                           \
+       for i in $$(${FIND} .${PREFIX}/lib -name '*.so' | ${SED} -e 's|^\./||'); do     \
+         install_name_tool -id /$$i $$i;                                               \
+       done
+.endif

Index: pkgsrc/security/py-bcrypt/Makefile
diff -u pkgsrc/security/py-bcrypt/Makefile:1.20 pkgsrc/security/py-bcrypt/Makefile:1.21
--- pkgsrc/security/py-bcrypt/Makefile:1.20     Mon Dec 11 12:14:36 2023
+++ pkgsrc/security/py-bcrypt/Makefile  Wed Dec 13 17:39:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/12/11 12:14:36 adam Exp $
+# $NetBSD: Makefile,v 1.21 2023/12/13 17:39:07 schmonz Exp $
 
 DISTNAME=      bcrypt-4.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,14 +18,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=        27
 
 .include "cargo-depends.mk"
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-post-install:
-       install_name_tool -id ${PREFIX}/${PYSITELIB}/bcrypt/_bcrypt.abi3.so \
-       ${DESTDIR}${PREFIX}/${PYSITELIB}/bcrypt/_bcrypt.abi3.so
-.endif
-
 .include "../../lang/python/wheel.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-cryptography/Makefile
diff -u pkgsrc/security/py-cryptography/Makefile:1.106 pkgsrc/security/py-cryptography/Makefile:1.107
--- pkgsrc/security/py-cryptography/Makefile:1.106      Tue Nov 28 17:37:24 2023
+++ pkgsrc/security/py-cryptography/Makefile    Wed Dec 13 17:39:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2023/11/28 17:37:24 adam Exp $
+# $NetBSD: Makefile,v 1.107 2023/12/13 17:39:07 schmonz Exp $
 
 DISTNAME=      cryptography-41.0.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -33,13 +33,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=        27
 pre-build:
        cd ${WRKSRC} && ${LN} -f -s src/rust/.cargo .cargo
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-post-install:
-       install_name_tool -id ${PREFIX}/${PYSITELIB}/cryptography/hazmat/bindings/_rust.abi3.so \
-       ${DESTDIR}${PREFIX}/${PYSITELIB}/cryptography/hazmat/bindings/_rust.abi3.so
-.endif
-
 .include "cargo-depends.mk"
 
 .include "../../lang/python/wheel.mk"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/databases/py-tortoise-orm
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/databases/py-tortoise-orm
Indexes:

Home | Main Index | Thread Index | Old Index