Bug 271643 - devel/blame: update to 1.3.1-20221108 and fix build on armv7
Summary: devel/blame: update to 1.3.1-20221108 and fix build on armv7
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: Robert Clausecker
URL: https://invisible-island.net/rcs-blam...
Keywords:
Depends on:
Blocks:
 
Reported: 2023-05-25 22:53 UTC by Robert Clausecker
Modified: 2023-05-29 23:28 UTC (History)
4 users (show)

See Also:
jhein: maintainer-feedback+


Attachments
devel/blame: update to 1.3.1-20221108 and fix build on armv7 (5.72 KB, patch)
2023-05-25 22:53 UTC, Robert Clausecker
fuz: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Robert Clausecker freebsd_committer freebsd_triage 2023-05-25 22:53:37 UTC
Created attachment 242411 [details]
devel/blame: update to 1.3.1-20221108 and fix build on armv7

Fix build on armv7 by importing a gnulib patch.
Take maintainership.

Changelog: https://invisible-island.net/rcs-blame/ChangeLog.html
Comment 1 Fernando Apesteguía freebsd_committer freebsd_triage 2023-05-26 11:54:42 UTC
^Triage: reporter is committer, assign accordingly.
Comment 2 John Hein 2023-05-26 19:17:36 UTC
(In reply to Robert Clausecker from comment #0)
The Makefile.in patch seems like unnecessary patching.  Is there a good reason to diverge from upstream here?

Did you submit the long int patch upstream?
Comment 3 Robert Clausecker freebsd_committer freebsd_triage 2023-05-26 19:19:35 UTC
(In reply to John Hein from comment #2)

Yes, it is required.  This is because make(1) diverges from POSIX in that it executes all shell commands in a target in one big shell instead of running each in a shell on its own.  So directory changes persist, breaking the target.  This patch works around this divergent behaviour, fixing the build.

The other patch is from gnulib (whence mktime.c originates) and was inserted based on a recommendation from upstream.
Comment 4 Robert Clausecker freebsd_committer freebsd_triage 2023-05-26 19:20:30 UTC
If you are the maintainer, please indicate if you wish to continue maintaining the port.  If so, I'll take out the bit where it sets MAINTAINER=fuz@FreeBSD.org on commit.
Comment 5 John Hein 2023-05-26 19:26:14 UTC
(In reply to Robert Clausecker from comment #3)
Re: Makefile issue.  Got it - problems with concurrency.  Agreed.
Comment 6 John Hein 2023-05-26 19:30:28 UTC
(In reply to Robert Clausecker from comment #4)
It's fine with me if you want to take maintainership.

I understand regarding the gnulib patch.  I was just thinking we should at least notify upstream about it even if the patch is against [old] gnulib-owned code.
Comment 7 John Hein 2023-05-26 19:32:15 UTC
(In reply to John Hein from comment #6)
I see now you did include the upstream maintainer in the CC list.
Comment 8 Robert Clausecker freebsd_committer freebsd_triage 2023-05-26 19:53:57 UTC
Comment on attachment 242411 [details]
devel/blame: update to 1.3.1-20221108 and fix build on armv7

Thanks.  Will commit with my next batch.
Comment 9 commit-hook freebsd_committer freebsd_triage 2023-05-29 23:27:08 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=36fcf661ba23c96004395f6ee52cf2e6133b31f0

commit 36fcf661ba23c96004395f6ee52cf2e6133b31f0
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-05-25 16:52:21 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-05-29 23:24:06 +0000

    devel/blame: update to 1.3.1-20221108

    Fix build on armv7 by importing a gnulib patch.
    Take maintainership.

    Changelog: https://invisible-island.net/rcs-blame/ChangeLog.html

    Approved by:    jhein@symmetricom.com (maintainer)
    PR:             271643

 devel/blame/Makefile                       | 15 +++---
 devel/blame/distinfo                       |  5 +-
 devel/blame/files/patch-Makefile.in (new)  | 17 +++++++
 devel/blame/files/patch-lib_mktime.c (new) | 77 ++++++++++++++++++++++++++++++
 4 files changed, 105 insertions(+), 9 deletions(-)