From nobody Sat Aug 10 13:35:43 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 4Wh1xr0NHsz5StqM; Sat, 10 Aug 2024 13:35:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wh1xq6dmnz49t1; Sat, 10 Aug 2024 13:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723296943; 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=k6YWKTYaIrsOTYEz/iSP4qN/3SlVPABw+Dsat2ZU5F0=; b=yvv5KfXDdsHlMQiA2H9vfPLglTx4k1l2gVrNeMjo9FZdxcRp+24KbyoHDlqw1CfOXzKUHB 1BYaJ+ubyc36FC3PYLXnWhG8fH+kwAIA8Wos7K4ET+WOZR260L/8znDWAbn75FF/FocZZl sJtxBLmut7NkqLdNG2DHGB5g6DyRCwlXjCO4n02qhyjdJYaBXbIvFB/AqZ2HcU+Spl5rr6 pRR7T3Jkxsv65KLgFSAQ/6A+F3ZwGzGFGVT7JvwvA86/0oxv/zOH4kt7IPaws58CRVeUJ0 7im9eZXVr4U4s/j0CywCOa9VG+TyrHce/RWuLG1/Criv6xGOPUeXkAIPsYU2VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723296943; a=rsa-sha256; cv=none; b=xX9QhakCKxuNIX4alDe86WIKHG2CeC4G3AmtPUb5So1ig2R1rJhIHXG6koUKSKbhnoLSiU tb8V+bn/bH6ojVq7rWYDnmhJPNJzVkIS2pwpWdy3Qprz/oW87+KxYQXN1P8X8BCQzh7Mxz PnUvsaz0rkdxi7mYYNJdy+gWJcUJtLscvMIzs6VONr6DnrDdtWEBmudvLDmYaVbB0hDSmF sWHFJa4FfLH2KujCMDSBL/8U+gbBR4FsbAJdwNrCvFteMHV2Xs2OYCCSnylzwOEjXo9G7m n9gCsWgORZhymCmxpN5vDjHoaedqfJGagkfMQlNCssOIotZxGtxxbsd9sIoMuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723296943; 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=k6YWKTYaIrsOTYEz/iSP4qN/3SlVPABw+Dsat2ZU5F0=; b=fxlXZ1p4AmWRpyVy6yUFsVy2NhxhKZOkHbn9e4i7HWQVlGLDa37dqHWkt4b0bRuyoBB9WK AEe6IiM6Py5YYuekj90aTgLdOKItfVb6BLb9eMCITK2617GsoM1Q6ATD1Q5XFncHqQQqt1 3bmFw19XVSQXVEw2MH2cnRsQY9yQFQ46pGZLDqlm9Ot+3wZeOfHZuux2L5G9G0cu5E5joi PqZkckJ28V7VAh7N6st++m3Kadso1kuYVO6OJp9/ijDA2xNbLtjEarmUjg1nhFAFdWAB/U eULf9QDABLUs4qxuwGla0jyvEzqqZ98r0Yfqu6aF63igvLcDRc2jPHX3l7P9/A== 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 4Wh1xq6Dcvz12jc; Sat, 10 Aug 2024 13:35:43 +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 47ADZhjQ035744; Sat, 10 Aug 2024 13:35:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47ADZh53035741; Sat, 10 Aug 2024 13:35:43 GMT (envelope-from git) Date: Sat, 10 Aug 2024 13:35:43 GMT Message-Id: <202408101335.47ADZh53035741@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 3c2460a20bf5 - main - devel/pycdc: Various fixes 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c2460a20bf5b91519df82352858c6cf8215eed2 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c2460a20bf5b91519df82352858c6cf8215eed2 commit 3c2460a20bf5b91519df82352858c6cf8215eed2 Author: Daniel Engberg AuthorDate: 2024-08-10 13:26:41 +0000 Commit: Daniel Engberg CommitDate: 2024-08-10 13:35:39 +0000 devel/pycdc: Various fixes * Remove bash as build dependency * Define USES= compiler:c++11-lang * Define Python dependency for "make test" and env for build to enable PYTHON vars when using USES= shebangfix * Define bash as dependency for "make test" * Use TEST_TARGET instead of do-test Approved by: portmgr (blanket, build fix) --- devel/pycdc/Makefile | 13 +++++++------ devel/pycdc/files/patch-tests_decompyle__test.sh | 11 +++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/devel/pycdc/Makefile b/devel/pycdc/Makefile index 60896dd85286..418657bbba63 100644 --- a/devel/pycdc/Makefile +++ b/devel/pycdc/Makefile @@ -8,21 +8,22 @@ COMMENT= Python bytecode disassembler and decompiler LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= bash:shells/bash +TEST_DEPENDS= bash:shells/bash -USES= cmake shebangfix +USES= cmake compiler:c++11-lang python:env,test shebangfix +SHEBANG_FILES= scripts/pymultic scripts/token_dump tests/*.sh USE_GITHUB= yes GH_ACCOUNT= zrax GH_TAGNAME= 48d1bfa -SHEBANG_FILES= tests/all_tests.sh \ - tests/decompyle_test.sh +TEST_TARGET= check PLIST_FILES= bin/pycdas \ bin/pycdc -do-test: - cd ${BUILD_WRKSRC} && ninja check +post-patch: + @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' \ + ${PATCH_WRKSRC}/tests/decompyle_test.sh .include diff --git a/devel/pycdc/files/patch-tests_decompyle__test.sh b/devel/pycdc/files/patch-tests_decompyle__test.sh new file mode 100644 index 000000000000..fff31c17037a --- /dev/null +++ b/devel/pycdc/files/patch-tests_decompyle__test.sh @@ -0,0 +1,11 @@ +--- tests/decompyle_test.sh.orig 2024-08-10 12:46:23 UTC ++++ tests/decompyle_test.sh +@@ -6,7 +6,7 @@ if [[ -z "$PYTHON_EXE" ]]; then + outdir="$2" + + if [[ -z "$PYTHON_EXE" ]]; then +- PYTHON_EXE="$(which python3)" ++ PYTHON_EXE="%%PYTHON_CMD%%" + fi + + if [[ -z "$testname" ]]; then