Bug 272216
| Summary: | devel/gmake: Update to 4.4.1 | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | takefu | ||||||||
| Component: | Individual Port(s) | Assignee: | Tijl Coosemans <tijl> | ||||||||
| Status: | Closed FIXED | ||||||||||
| Severity: | Affects Only Me | CC: | bdrewery, danfe, tijl | ||||||||
| Priority: | --- | Flags: | tijl:
maintainer-feedback+
antoine: exp-run+ |
||||||||
| Version: | Latest | ||||||||||
| Hardware: | Any | ||||||||||
| OS: | Any | ||||||||||
| Bug Depends on: | 276478 | ||||||||||
| Bug Blocks: | 277046 | ||||||||||
| Attachments: |
|
||||||||||
Created attachment 243350 [details]
patch2
Add a patch to hardcode c++ as the default C++ compiler.
Some new failure logs: https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/flite-2.1.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/cscout-3.01.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/apache-openoffice-devel-4.2.1678061694_2,4.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/jfsw-20211225_2.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/dynamechs-4.0.p1_9,1.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/elixir-1.14.5.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/mono-5.10.1.57_4.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/mono5.10-5.10.1.57_3.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/apron-0.9.13.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/cado-nfs-2.3.0.20220722.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/gap-4.12.2.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/scilab-6.1.1_10.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/delegate-9.9.13_1.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/ocean-spectroscopy-code-3.0.4.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/openmodelica-1.20.0_2.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/sslproxy-0.9.4,1.log https://pkg-status.freebsd.org/package18/data/124amd64-default-foo/2023-07-17_07h20m42s/logs/errors/sslsplit-0.5.5_1.log https://pkg-status.freebsd.org/pb2/data/124i386-default-foo/2023-07-17_07h20m43s/logs/errors/asmutils-0.18_10.log (In reply to Tijl Coosemans from comment #1) > Add a patch to hardcode c++ as the default C++ compiler. So this restores files/patch-src-default.c which makes sense (g++ -> c++) but I'm wondering why files/patch-configure is also needed. (In reply to Alexey Dokuchaev from comment #3) There's only patch-configure, patch-src-default.c isn't restored. The code has changed. The default is no longer g++ but MAKE_CXX, which is set to $CXX in configure. I think this is a bad default because the build time C++ compiler could be anything, e.g. a cross compiler, and it doesn't match the defaults for the C compiler, linker, and other tools that are still hardcoded as cc, ld, and so on. (In reply to Tijl Coosemans from comment #4) > There's only patch-configure, patch-src-default.c isn't restored. Right, sorry, I've misread the diff but realized my mistake just after I've sent my comment. :-( > I think this is a bad default [...] and it doesn't match the defaults for > the C compiler, linker, and other tools that are still hardcoded as cc, > ld, and so on. Makes perfect sense now, thank you Tijl. Created attachment 248833 [details] patch3 Rebased patch + some fallout fixes. Let's try another exp-run now that bug 276478 has landed. Exp-run looks fine A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=687edfacdc85d4a63e8139e1c22cb11c1c7f0751 commit 687edfacdc85d4a63e8139e1c22cb11c1c7f0751 Author: Kenji Takefu <takefu@airport.fm> AuthorDate: 2023-07-12 08:58:28 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2024-03-03 09:44:21 +0000 devel/gmake: Update to 4.4.1 Some ports required patches. PR: 272216 Exp-run by: antoine Mk/Uses/gmake.mk | 2 +- audio/flite/files/patch-main_Makefile | 11 +- devel/asmutils/Makefile | 1 + devel/cscout/files/patch-src_Makefile | 22 +++- devel/gdb/Makefile | 24 ++-- devel/gmake/Makefile | 18 ++- devel/gmake/distinfo | 6 +- devel/gmake/files/patch-10-6e6abd0c (gone) | 127 --------------------- devel/gmake/files/patch-configure (new) | 11 ++ devel/gmake/files/patch-lib-glob.c (gone) | 10 -- devel/gmake/files/patch-src-default.c (gone) | 11 -- devel/gmake/files/patch-src-makeint.h (gone) | 10 -- devel/gmake/pkg-plist | 1 + .../files/patch-jfaudiolib_Makefile.shared (new) | 17 +++ .../jfsw/files/patch-jfbuild_Makefile.shared (new) | 17 +++ graphics/dynamechs/Makefile | 2 +- math/apron/files/patch-apron_Makefile (new) | 11 ++ math/cado-nfs/Makefile | 7 +- net/delegate/Makefile | 1 + security/sslproxy/files/patch-Mk_main.mk (new) | 51 +++++++++ 20 files changed, 168 insertions(+), 192 deletions(-) This failure happened this morning: https://pkg-status.freebsd.org/package19/data/140amd64-default-build-as-user/b087fefc9c39/logs/errors/flite-2.1.log A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f49d105b760c6191e57fa844ef1b85e468793bb commit 9f49d105b760c6191e57fa844ef1b85e468793bb Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2024-03-04 11:45:18 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2024-03-04 13:31:45 +0000 audio/flite: Fix parallel build with gmake 4.4 Remove prerequisites from .NOTPARALLEL to restore the behaviour from previous versions of gmake. PR: 272216 Reported by: antoine audio/flite/files/patch-main_Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) This failure looks related too: https://pkg-status.freebsd.org/package18/data/140amd64-default-foo/2024-03-04_09h39m06s/logs/errors/scilab-6.1.1_16.log A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d5367bc0202a15d5a2bf06eed0501ec901e53f8 commit 5d5367bc0202a15d5a2bf06eed0501ec901e53f8 Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2024-03-06 09:59:01 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2024-03-06 10:18:35 +0000 math/scilab: Fix parallel build with gmake 4.4 Remove prerequisites from .NOTPARALLEL to restore the behaviour from previous versions of gmake. PR: 272216 Reported by: antoine math/scilab/files/patch-Makefile.in (new) | 11 +++++++++++ math/scilab/files/patch-modules_Makefile.in (new) | 11 +++++++++++ 2 files changed, 22 insertions(+) A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=830ec3717024e0060b2b48db4319a4eb060f8023 commit 830ec3717024e0060b2b48db4319a4eb060f8023 Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2024-03-06 19:13:39 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2024-03-06 20:22:21 +0000 Mk/Scripts/do-depends.sh: Avoid make -D flag Both FreeBSD make and GNU make pass command line flags to sub-makes through the MAKEFLAGS environment variable, but the flags aren't compatible and GNU make 4.4 exits with an error when it encounters flags it doesn't understand, e.g. -D. Avoid using the flag for now until ports run gmake with SETENVI. This fixes the case where a port is built using make directly and it recurses to build a dependency that uses gmake. Poudriere does not use this feature of the ports tree to build dependencies so it's not affected. PR: 272216, 277492 Mk/Scripts/do-depends.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=755d190db121778a25b45950c397163325d8e797 commit 755d190db121778a25b45950c397163325d8e797 Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2024-03-06 20:38:58 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2024-03-06 20:44:44 +0000 ports-mgmt/portmaster: Avoid make -D flag Both FreeBSD make and GNU make pass command line flags to sub-makes through the MAKEFLAGS environment variable, but the flags aren't compatible and GNU make 4.4 exits with an error when it encounters flags it doesn't understand, e.g. -D. Avoid using the flag for now until ports run gmake with SETENVI. PR: 272216, 277492 ports-mgmt/portmaster/Makefile | 2 +- ports-mgmt/portmaster/files/patch-portmaster (new) | 71 ++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) |
Created attachment 243001 [details] gmake-4.4.1.patch Update 4.4.1 fix portlint(1),portclippy(1) Compliant.