Bug 274601 - games/jaggedalliance2: unbreak i386 build on fbsd 14+
Summary: games/jaggedalliance2: unbreak i386 build on fbsd 14+
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:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-10-19 22:22 UTC by Pavel Timofeev
Modified: 2023-11-18 20:25 UTC (History)
1 user (show)

See Also:
fuz: merge-quarterly+


Attachments
port patch (2.57 KB, patch)
2023-10-19 22:22 UTC, Pavel Timofeev
timp87: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Pavel Timofeev 2023-10-19 22:22:54 UTC
Created attachment 245751 [details]
port patch

- unbreak i386 build on fbsd 14+
- remove unnecessary lua version hardcode
- bump port revision
Comment 1 Robert Clausecker freebsd_committer freebsd_triage 2023-10-21 20:22:54 UTC
Have you tested that the port works fine with lua 5.4 or later?
Comment 2 Robert Clausecker freebsd_committer freebsd_triage 2023-10-21 20:24:56 UTC
Also, would you like this fix to be merged into the quarterly branch?  If yes, set the merge-quarterly flag to "?".
Comment 3 Pavel Timofeev 2023-10-21 21:13:34 UTC
(In reply to Robert Clausecker from comment #1)
Yes I did
Comment 4 commit-hook freebsd_committer freebsd_triage 2023-10-23 01:54:36 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=79f74ed60e1aa1a08f983af1f72204d7c8929d8a

commit 79f74ed60e1aa1a08f983af1f72204d7c8929d8a
Author:     Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2023-10-19 20:45:54 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-10-23 01:51:28 +0000

    games/jaggedalliance2: unbreak i386 build on fbsd 14+

    - unbreak i386 build on fbsd 14+
    - remove unnecessary lua version hardcode
    - bump port revision

    PR:             274601
    MFH:            2023Q4

 games/jaggedalliance2/Makefile                          | 17 ++++-------------
 .../patch-dependencies_lib-lua_CMakeLists.txt (gone)    | 11 -----------
 2 files changed, 4 insertions(+), 24 deletions(-)
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-10-23 01:56:47 UTC
A commit in branch 2023Q4 references this bug:

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

commit 9ed3ba96d38f41419700c1e19534523256020610
Author:     Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2023-10-19 20:45:54 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-10-23 01:55:42 +0000

    games/jaggedalliance2: unbreak i386 build on fbsd 14+

    - unbreak i386 build on fbsd 14+
    - remove unnecessary lua version hardcode
    - bump port revision

    PR:             274601
    MFH:            2023Q4
    (cherry picked from commit 79f74ed60e1aa1a08f983af1f72204d7c8929d8a)

 games/jaggedalliance2/Makefile                          | 17 ++++-------------
 .../patch-dependencies_lib-lua_CMakeLists.txt (gone)    | 11 -----------
 2 files changed, 4 insertions(+), 24 deletions(-)
Comment 6 Robert Clausecker freebsd_committer freebsd_triage 2023-10-23 01:58:27 UTC
Thank you for your contribution.
Comment 7 commit-hook freebsd_committer freebsd_triage 2023-11-18 20:24:26 UTC
A commit in branch main references this bug:

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

commit e3aeb5c7a93b7b9b6df753648e0669143476916d
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-11-16 20:53:33 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-11-18 20:20:41 +0000

    games/jaggedalliance2: extend 14.0+ build fix to all architectures

    The fix seems to be needed on amd64 too, so apply it to all
    architectures just in case.

    Reported by:    Martin Neubauer <m.ne@gmx.net>
    Approved by:    portmgr (build fix blanket)
    PR:             275069, 274601
    MFH:            2023Q4

 games/jaggedalliance2/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Comment 8 commit-hook freebsd_committer freebsd_triage 2023-11-18 20:25:30 UTC
A commit in branch 2023Q4 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=481fc59a5fde8489b9a9583144b24204d255b2fb

commit 481fc59a5fde8489b9a9583144b24204d255b2fb
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-11-16 20:53:33 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-11-18 20:24:40 +0000

    games/jaggedalliance2: extend 14.0+ build fix to all architectures

    The fix seems to be needed on amd64 too, so apply it to all
    architectures just in case.

    Reported by:    Martin Neubauer <m.ne@gmx.net>
    Approved by:    portmgr (build fix blanket)
    PR:             275069, 274601
    MFH:            2023Q4

    (cherry picked from commit e3aeb5c7a93b7b9b6df753648e0669143476916d)

 games/jaggedalliance2/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)