From nobody Tue Oct 29 14:41:17 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XdCcb1dh1z5bXCk; Tue, 29 Oct 2024 14:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XdCcY3Bx9z4PvL; Tue, 29 Oct 2024 14:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730212877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6D9Crr7ecuD2QdSVSXF21lSlEwik6oogSrHXXu/EH0=; b=Hcjo9NpHglA//M1dw/ssemGONIl+7K3K6/lUbLzDUBsSkqXQW+XOkvfUlcmnZfm8P5Il9d v2tMH9QcGJVOfHXeAxG2Jcc494tImZQlrZhPOMFpBuAyjz8Y6rnvsFUTz1jjojGVxlyBnl HBGUukRrgvYLixcfg2rbsDzO2cVMinhnv8qLcEMTnLZzz7J8ICeF8RAlI8nAOu9sMFqW7K Mexf4uKduxXj8l/I5xN6mBVCbeQ19EFpbguIgwjrmpQZePXH/q+dLVL6MbxzAQfd7iuUEr ff94S5jg4/G8E8CIcphfw23D8JC0MeO5Gyzbh6OSRsEThi0NVvq6XYzuYnGx6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730212877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6D9Crr7ecuD2QdSVSXF21lSlEwik6oogSrHXXu/EH0=; b=qCzTq33yTHdelRSv+neQZye455P6HzIZJSlSAfCcUBWZNt3wWFJTkS7EidIZcTdlPChDdE c9+dNMln2pCCSJ/e8hGkWTsmyylk9ZbK5EFS8Ay9+NZpz9S+K5nBTcPQ96Hz6Hd2SZgDLh z2d30xk8IfWRyP90TbBFNYA/Et2si1khPL+RAA8K0No4X82pAapd9/qcfNroYE6pYyAXcz Xu7Gqn66v2Os/T34yM7WSPBrWGbKz+TApXnp7oYH4itcvMTY/jBT+cWSAQGas0bD5O+CWS oaEeAhvcO4IOMKrQW45GlAAZwAh2a4rkFSJsgefOklVNlJ5ZovEHoKoL2arfaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730212877; a=rsa-sha256; cv=none; b=jCo12PKw1z4ljC8vM6WMlOtoy/UX3cy9JFpY/kqS0X5KgSuPORUhHJJ3jKlXrGvwkbE8DM fdaFm3xYPSzhEOp69nMAKBqsNkP4cQbPa7/AcJer36JO0u6RUZZqgMc2bAHCvgGLnlHV6O HBwgJB91J2QrcBPa6htbS07SrlWngtR8J0xiq7aFGfNjw7QPkSugVkV8rpZE00CtL175JA PhdosKUIzUnGFTGmvKKr4DL1vO5KM04CuW46PeaIASGvhcrUsmxIcdDIuM6UoOVtnOyYYf 3u5LgV/xuWYkljsStNV3M4+KOt3R+gckpo4yUvxwfO3cdTEUMuXI9k7QC4IDEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XdCcY2p7yzRRJ; Tue, 29 Oct 2024 14:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49TEfHqt064012; Tue, 29 Oct 2024 14:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TEfH6t064009; Tue, 29 Oct 2024 14:41:17 GMT (envelope-from git) Date: Tue, 29 Oct 2024 14:41:17 GMT Message-Id: <202410291441.49TEfH6t064009@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: ee5cf48426d3 - main - devel/py-awscrt: Do not use bundled libraries List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee5cf48426d36b043110139be82378996872d596 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee5cf48426d36b043110139be82378996872d596 commit ee5cf48426d36b043110139be82378996872d596 Author: Po-Chuan Hsieh AuthorDate: 2024-10-29 14:19:15 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-10-29 14:38:33 +0000 devel/py-awscrt: Do not use bundled libraries - Bump PORTREVISION for dependency change --- devel/py-awscrt/Makefile | 20 +++++++++++++- devel/py-awscrt/files/patch-powerpc64le | 18 ------------- devel/py-awscrt/files/patch-setup.py | 46 +++++++-------------------------- 3 files changed, 28 insertions(+), 56 deletions(-) diff --git a/devel/py-awscrt/Makefile b/devel/py-awscrt/Makefile index 18cf282d49d2..800b2b5a4f9f 100644 --- a/devel/py-awscrt/Makefile +++ b/devel/py-awscrt/Makefile @@ -1,5 +1,6 @@ PORTNAME= awscrt PORTVERSION= 0.23.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,12 +14,29 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +LIB_DEPENDS= libaws-c-auth.so:security/aws-c-auth \ + libaws-c-cal.so:security/aws-c-cal \ + libaws-c-common.so:devel/aws-c-common \ + libaws-c-compression.so:devel/aws-c-compression \ + libaws-c-event-stream.so:devel/aws-c-event-stream \ + libaws-c-http.so:devel/aws-c-http \ + libaws-c-io.so:devel/aws-c-io \ + libaws-c-mqtt.so:devel/aws-c-mqtt \ + libaws-c-s3.so:devel/aws-c-s3 \ + libaws-c-sdkutils.so:devel/aws-c-sdkutils \ + libaws-checksums.so:devel/aws-checksums \ + libcrypto.so:security/aws-lc \ + libs2n.so:security/s2n-tls -USES= cmake:indirect python ssl +USES= localbase:ldflags python ssl USE_PYTHON= autoplist concurrent pep517 MAKE_ENV= AWS_CRT_BUILD_USE_SYSTEM_LIBCRYPTO=1 +# Clean up bundled libraries +post-patch: + @${RM} -r ${WRKSRC}/crt/ + post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/devel/py-awscrt/files/patch-powerpc64le b/devel/py-awscrt/files/patch-powerpc64le deleted file mode 100644 index ebd7f1993820..000000000000 --- a/devel/py-awscrt/files/patch-powerpc64le +++ /dev/null @@ -1,18 +0,0 @@ ---- crt/aws-lc/crypto/fipsmodule/cpucap/cpu_ppc64le.c.orig 2024-07-03 21:50:24 UTC -+++ crt/aws-lc/crypto/fipsmodule/cpucap/cpu_ppc64le.c -@@ -69,10 +69,15 @@ void OPENSSL_cpuid_setup(void) { - - void OPENSSL_cpuid_setup(void) { - #if defined(AT_HWCAP2) -+#if defined(__linux__) - OPENSSL_ppc64le_hwcap2 = getauxval(AT_HWCAP2); -+#elif defined(__FreeBSD__) -+ elf_aux_info(AT_HWCAP2, &OPENSSL_ppc64le_hwcap2, sizeof(OPENSSL_ppc64le_hwcap2)); -+#endif - #else - OPENSSL_ppc64le_hwcap2 = 0; - #endif -+ - OPENSSL_cpucap_initialized = 1; - - // OPENSSL_ppccap is a 64-bit hex string which may start with "0x". diff --git a/devel/py-awscrt/files/patch-setup.py b/devel/py-awscrt/files/patch-setup.py index 0f9b5b31657a..ac7a17b4f95a 100644 --- a/devel/py-awscrt/files/patch-setup.py +++ b/devel/py-awscrt/files/patch-setup.py @@ -1,39 +1,11 @@ ---- setup.py.orig 2024-10-21 22:20:04 UTC +--- setup.py.orig 2024-10-23 17:56:10 UTC +++ setup.py -@@ -12,7 +12,6 @@ import sysconfig - import subprocess - import sys - import sysconfig --from wheel.bdist_wheel import bdist_wheel - if sys.platform == 'win32': - # distutils is deprecated in Python 3.10 and removed in 3.12. However, it still works because Python defines a compatibility interface as long as setuptools is installed. - # We don't have an official alternative for distutils.ccompiler as of September 2024. See: https://github.com/pypa/setuptools/issues/2806 -@@ -306,20 +305,6 @@ class awscrt_build_ext(setuptools.command.build_ext.bu - super().run() +@@ -353,7 +353,7 @@ def awscrt_ext(): + # In Brazil, both shared and static libs are available. + # But Lambda requires all shared libs to be explicitly packaged up. + # So it's simpler to link them in statically and have less runtime dependencies. +- libraries = [':lib{}.a'.format(x) for x in libraries] ++ libraries = [':lib{}.so'.format(x) for x in libraries] - --class bdist_wheel_abi3(bdist_wheel): -- def get_tag(self): -- python, abi, plat = super().get_tag() -- # on CPython, our wheels are abi3 and compatible back to 3.11 -- if python.startswith("cp") and sys.version_info >= (3, 13): -- # 3.13 deprecates PyWeakref_GetObject(), adds alternative -- return "cp313", "abi3", plat -- elif python.startswith("cp") and sys.version_info >= (3, 11): -- # 3.11 is the first stable ABI that has everything we need -- return "cp311", "abi3", plat -- -- return python, abi, plat -- -- - def awscrt_ext(): - # fetch the CFLAGS/LDFLAGS from env - extra_compile_args = os.environ.get('CFLAGS', '').split() -@@ -468,6 +453,6 @@ setuptools.setup( - ], - python_requires='>=3.8', - ext_modules=[awscrt_ext()], -- cmdclass={'build_ext': awscrt_build_ext, "bdist_wheel": bdist_wheel_abi3}, -+ cmdclass={'build_ext': awscrt_build_ext}, - test_suite='test', - ) + # OpenBSD doesn't have librt; functions are found in libc instead. + if not sys.platform.startswith('openbsd'):