Bug 272084 - devel/llvm-devel: Patch failure
Summary: devel/llvm-devel: Patch failure
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Brooks Davis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-06-20 01:39 UTC by Cy Schubert
Modified: 2023-06-20 16:41 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (brooks)


Attachments
Fix llvm-devel patch regression (608 bytes, patch)
2023-06-20 01:39 UTC, Cy Schubert
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Cy Schubert freebsd_committer freebsd_triage 2023-06-20 01:39:17 UTC
Created attachment 242883 [details]
Fix llvm-devel patch regression

devel/llvm-devel fails to patch on the following error:

_devel|'  -e 's|lit\.|lit_devel.|g'  /export/wrkdir/amd64/export/freebsd/git/ports/devel/llvm-devel/work-default/llvm-project-8a7a2da18f9add7fb58fe707e4f0256e3abeb8fa/llvm/utils/lit/lit.py  /export/wrkdir/amd64/export/freebsd/git/ports/devel/llvm-devel/work-default/llvm-project-8a7a2da18f9add7fb58fe707e4f0256e3abeb8fa/llvm/utils/lit/lit/*.py  /export/wrkdir/amd64/export/freebsd/git/ports/devel/llvm-devel/work-default/llvm-project-8a7a2da18f9add7fb58fe707e4f0256e3abeb8fa/llvm/utils/lit/lit/builtin_commands/*.py
/export/wrkdir/amd64/export/freebsd/git/ports/devel/llvm-devel/work-default/llvm-project-8a7a2da18f9add7fb58fe707e4f0256e3abeb8fa/llvm/utils/lit/lit/formats/*.py
/bin/sh: /export/wrkdir/amd64/export/freebsd/git/ports/devel/llvm-devel/work-default/llvm-project-8a7a2da18f9add7fb58fe707e4f0256e3abeb8fa/llvm/utils/lit/lit/formats/__init__.py: Permission denied
*** Error code 126

Stop.
make[1]: stopped in /export/freebsd/git/ports/devel/llvm-devel
*** Error code 1

The attached patch addresses the regression.
Comment 1 Brooks Davis freebsd_committer freebsd_triage 2023-06-20 05:06:39 UTC
bah. patch looks fine. Feel free to commit or I'll do it in Tuesday
Comment 2 Cy Schubert freebsd_committer freebsd_triage 2023-06-20 05:52:53 UTC
Thanks. It's been pushed.
Comment 3 commit-hook freebsd_committer freebsd_triage 2023-06-20 05:53:36 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8bf321a61f45f0cce03c5145f615ab3284a354b6

commit 8bf321a61f45f0cce03c5145f615ab3284a354b6
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-06-20 05:47:50 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-06-20 05:47:50 +0000

    devel/llvm-devel: Fix llvm-devel patch regression

    Fix:

    /bin/sh: /export/wrkdir/amd64/export/freebsd/git/ports/devel/llvm-devel/work-default/llvm-project-8a7a2da18f9add7fb58fe707e4f0256e3abeb8fa/llvm/utils/lit/lit/formats/__init__.py: Permission denied
    *** Error code 126

    PR:             272084
    Approved by:    brooks (Maintainer)

 devel/llvm-devel/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Comment 4 Cy Schubert freebsd_committer freebsd_triage 2023-06-20 14:55:39 UTC
Crap. Looks like I didn't do a complete job.

sed: /export/wrkdir/amd64/usr/ports/devel/llvm-devel/work-default/llvm-project-8a7a2da18f9add7fb58fe707e4f0256e3abeb8fa/llvm/utils/lit/lit/llcm/*.py: No such file or directory
*** Error code 1

I'm sure I did a make patch test. Or maybe I forgot to make clean before,
Comment 5 Brooks Davis freebsd_committer freebsd_triage 2023-06-20 16:20:30 UTC
There's an llcm that should be llvm. :( I've got a build nearly complete and will commit when it's done.
Comment 6 commit-hook freebsd_committer freebsd_triage 2023-06-20 16:40:28 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9fe34588c282299a717604426cac7470c72ef75e

commit 9fe34588c282299a717604426cac7470c72ef75e
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-06-20 16:37:57 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-06-20 16:39:02 +0000

    devel/llvm-devel: typo fix (llcm->llvm)

    PR:             272084
    Fixes:          5a6a8d9fff8f9 devel/llvm-devel: Update to new snapshot

 devel/llvm-devel/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)