Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BF71184F3A for ; Thu, 23 Nov 2023 12:43:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id QOSA1yAAuAxy for ; Thu, 23 Nov 2023 12:43:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2129884D59 for ; Thu, 23 Nov 2023 12:43:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0E26CFA3F; Thu, 23 Nov 2023 12:43:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1700743416211340" MIME-Version: 1.0 Date: Thu, 23 Nov 2023 12:43:36 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20231123124336.0E26CFA3F@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1700743416211340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Nov 23 12:43:35 UTC 2023 Modified Files: pkgsrc/lang/python310: Makefile pkgsrc/lang/python311: Makefile pkgsrc/lang/python312: Makefile Log Message: python*: Remove -luuid hack on SunOS. This ends up leaking into the shipped python-config, which wouldn't normally be a problem, but broken build systems such as waf end up linking against libraries that are not buildlinked, resulting in missing libuuid references. If this is still required for builtin libuuid support then that will need to be done in a different way that doesn't end up in the exported libraries. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/python310/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/python311/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/python312/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1700743416211340 Content-Disposition: inline Content-Length: 2202 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python310/Makefile diff -u pkgsrc/lang/python310/Makefile:1.28 pkgsrc/lang/python310/Makefile:1.29 --- pkgsrc/lang/python310/Makefile:1.28 Fri Nov 10 16:55:31 2023 +++ pkgsrc/lang/python310/Makefile Thu Nov 23 12:43:35 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2023/11/10 16:55:31 nia Exp $ +# $NetBSD: Makefile,v 1.29 2023/11/23 12:43:35 jperkin Exp $ .include "dist.mk" @@ -85,7 +85,6 @@ PKG_CXX= clang++ # Used in socketmodule.c to determine if a sethostname declaration is required CFLAGS.SunOS+= -DPKGSRC_OPSYS_VERSION=${OPSYS_VERSION} LIBS.SunOS+= -lrt # fdatasync() -LIBS.SunOS+= -luuid .if ${OPSYS} == "SunOS" && ${OPSYS_VERSION} < 051100 SUBST_CLASSES+= setup SUBST_MESSAGE.setup= Replacing crypt with crypt_i Index: pkgsrc/lang/python311/Makefile diff -u pkgsrc/lang/python311/Makefile:1.20 pkgsrc/lang/python311/Makefile:1.21 --- pkgsrc/lang/python311/Makefile:1.20 Fri Nov 10 16:55:32 2023 +++ pkgsrc/lang/python311/Makefile Thu Nov 23 12:43:35 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2023/11/10 16:55:32 nia Exp $ +# $NetBSD: Makefile,v 1.21 2023/11/23 12:43:35 jperkin Exp $ .include "dist.mk" @@ -82,7 +82,6 @@ PKG_CXX= clang++ # Used in socketmodule.c to determine if a sethostname declaration is required CFLAGS.SunOS+= -DPKGSRC_OPSYS_VERSION=${OPSYS_VERSION} LIBS.SunOS+= -lrt # fdatasync() -LIBS.SunOS+= -luuid .if ${OPSYS} == "SunOS" && ${OPSYS_VERSION} < 051100 SUBST_CLASSES+= setup SUBST_MESSAGE.setup= Replacing crypt with crypt_i Index: pkgsrc/lang/python312/Makefile diff -u pkgsrc/lang/python312/Makefile:1.10 pkgsrc/lang/python312/Makefile:1.11 --- pkgsrc/lang/python312/Makefile:1.10 Fri Nov 10 16:55:32 2023 +++ pkgsrc/lang/python312/Makefile Thu Nov 23 12:43:35 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2023/11/10 16:55:32 nia Exp $ +# $NetBSD: Makefile,v 1.11 2023/11/23 12:43:35 jperkin Exp $ .include "dist.mk" @@ -91,7 +91,6 @@ PKG_CXX= clang++ # Used in socketmodule.c to determine if a sethostname declaration is required CFLAGS.SunOS+= -DPKGSRC_OPSYS_VERSION=${OPSYS_VERSION} LIBS.SunOS+= -lrt # fdatasync() -LIBS.SunOS+= -luuid LIBS.NetBSD+= -lcrypt --_----------=_1700743416211340--