Build on systems without 32-bit libraries has been broken (again) since commit 8bb96e3f34f057bf41034902075e2ced885db33d. Patch to be attached after bug creation. Thanks.
Created attachment 250801 [details] Fix (apply with 'git am')
Committed, thanks!
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=48f2a1c5a879f3ceff83a3e7564df12f8a2c6039 commit 48f2a1c5a879f3ceff83a3e7564df12f8a2c6039 Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2024-05-19 10:07:16 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2024-05-19 10:14:44 +0000 lang/gnat12: fix build on systems without 32-bit libraries Disable MULTILIB in this case. PR: 279143 Reported by: olce@ lang/gnat12/Makefile | 2 ++ 1 file changed, 2 insertions(+)
Thanks!
(In reply to Olivier Certner from comment #0) That looks my mistake, sorry about that.
(In reply to commit-hook from comment #3) I think this fix will need propagation into lang/gnat13.
(In reply to Alastair Hogge from comment #5) No problem, this can happen unnoticed, especially when doing refactoring. That said, although I seem to understand why you split the original sole `.if exists(/usr/lib32/libc.so)` into multiple ones (to have clear sections in the order recommended by the porters handbook), I probably wouldn't have done it since it obscures what is done or not in this and the other case, and is probably an important factor in the fact that introduction of this (minor) bug. Perhaps I'm acting against the law, but I view the porters' order as a guidance rather than an absolute requirement, and don't hesitate to depart from it when it goes again clear code/easy understanding. (In reply to Alastair Hogge from comment #6) Indeed. I had thought about doing that, but then simply forgot. (In reply to Thierry Thomas from comment #2) Since the patch applies to lang/gnat13 as well, could you please commit it for that port also? Thanks and regards.
Created attachment 250898 [details] Same patch but for lang/gnat13 (In reply to Olivier Certner from comment #7) Typo here: > ...is probably an important factor in the fact that introduction of this (minor) bug. Should read: > ...is probably an important factor in the fact that this (minor) bug could be introduced unnoticed. I spoke a little bit too soon concerning applying the attached patch to lang/gnat13: This doesn't work out of the box because of a context line. So, I've generated a new one directly against lang/gnat13. Please apply with 'git am'. Thanks and regards.
Re-opening to deal with lang/gnat13.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=9161cb3bced192dbe7765456685b035f28eb449b commit 9161cb3bced192dbe7765456685b035f28eb449b Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2024-05-23 15:47:09 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2024-05-23 15:47:09 +0000 lang/gnat13: fix on systems without 32-bit libraries Same patch than GNAT12. PR: 279143 Reported by: agh (at) riseup.net lang/gnat13/Makefile | 2 ++ 1 file changed, 2 insertions(+)
A commit in branch 2024Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=39da018952c27b683fb71fba8020e1f9d3217a32 commit 39da018952c27b683fb71fba8020e1f9d3217a32 Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2024-05-23 15:47:09 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2024-05-23 15:57:18 +0000 lang/gnat13: fix on systems without 32-bit libraries Same patch than GNAT12. PR: 279143 Reported by: agh (at) riseup.net (cherry picked from commit 9161cb3bced192dbe7765456685b035f28eb449b) lang/gnat13/Makefile | 2 ++ 1 file changed, 2 insertions(+)
A commit in branch 2024Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=83bc3ce78d66e405c9a14eba78075458ad202609 commit 83bc3ce78d66e405c9a14eba78075458ad202609 Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2024-05-19 10:07:16 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2024-05-23 15:53:01 +0000 lang/gnat12: fix build on systems without 32-bit libraries Disable MULTILIB in this case. PR: 279143 Reported by: olce@ (cherry picked from commit 48f2a1c5a879f3ceff83a3e7564df12f8a2c6039) lang/gnat12/Makefile | 2 ++ 1 file changed, 2 insertions(+)
Just committed, and also to 2024Q2: thanks for the reminder!