Bug 269552
| Summary: | devel/root: Update to version 6.28/00 | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Erik Jensen <erik> |
| Component: | Individual Port(s) | Assignee: | Nuno Teixeira <eduardo> |
| Status: | Closed FIXED | ||
| Severity: | Affects Some People | CC: | eduardo, erik |
| Priority: | --- | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
| URL: | https://root.cern/doc/v628/release-notes.html | ||
| Attachments: | |||
|
Description
Erik Jensen
2023-02-14 15:19:34 UTC
---
make: "devel/root/Makefile" line 70: Malformed conditional (${ARCH} == "aarch64")
make: "devel/root/Makefile" line 79: Malformed conditional (1204000 <= ${OSVERSION} && ${OSVERSION} < 1400000)
make: "devel/root/Makefile" line 88: Malformed conditional (${OSVERSION} < 1204000)
make: Fatal errors encountered -- cannot continue
---
Missing: .include <bsd.port.pre.mk> and .include <bsd.port.post.mk>
---
WARN: devel/root/files/patch-core_metacling_src_TCling.cxx: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: devel/root/files/patch-io_io_src_TFile.cxx: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: devel/root/files/patch-main_CMakeLists.txt: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
---
Created attachment 240213 [details]
Patch for update to version 6.28/00 -- .include <bsd.port.*.mk> added to Makefile
I added the missing ".include" statements, so `portlint` only reports a few warnings now.
Can you provide an example of how to utilise `make makepatch` properly?
(In reply to Erik Jensen from comment #2) Changes are made in ${WRKSRC} after saving unchanged files: 'file' -> 'file.orig' and changes made in 'file'. After changes are done, we can run `make makepatch` in port root ${WRKDIR} and patches are generated. https://docs.freebsd.org/en/books/porters-handbook/book/#slow-patch Created attachment 240277 [details]
Patch for update to version 6.28/00 -- `make makepatch` instead of `diff -u a.orig a > patch-a`
portlint seems to be happy about my patch files as well now.
`WRKSRC=/path/to/git-repo make makepatch` did the trick.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=7488335156ee822577bbf92ca011d8e9c7af3ad8 commit 7488335156ee822577bbf92ca011d8e9c7af3ad8 Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2023-02-20 17:06:21 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2023-02-20 17:08:40 +0000 devel/root: Update to 6.28/00 - ROOT *should* build on aarch64. Some oversights were present in the Makefile of the previous commit ChangeLog: https://root.cern/doc/v628/release-notes.html PR: 269552 devel/root/Makefile | 39 +- devel/root/distinfo | 6 +- .../files/patch-core_base_src_TUUID.cxx (gone) | 12 - .../root/files/patch-core_metacling_src_TCling.cxx | 4 +- .../patch-core_thread_src_TPosixThread.cxx (gone) | 11 - devel/root/files/patch-io_io_src_TFile.cxx (new) | 21 + devel/root/files/patch-main_CMakeLists.txt | 4 +- devel/root/pkg-plist | 1353 ++++++++++++-------- 8 files changed, 877 insertions(+), 573 deletions(-) Committed, thanks! |
