Created attachment 243754 [details] Patch file Update to 2.41 ChangeLog: https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=binutils/ChangeLog;h=866cf56d16af7994e23414c2d87cf08d119188cb;hb=2c73aeb8d2e02de7b69cbcb13361cfbca9d76a4e Build of all flavors succeeds with poudriere and 13.2-RELEASE amd64 jail.
The patch doesn't apply. slippy$ git co -b binutils Switched to a new branch 'binutils' slippy$ git am /tmp/devel_binutils.patch Applying: devel/binutils: Update to 2.41 error: patch failed: devel/binutils/Makefile:1 error: devel/binutils/Makefile: patch does not apply Patch failed at 0001 devel/binutils: Update to 2.41 hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". slippy$ git am --abort slippy$ pwd /home/cy/freebsd/git/ports slippy$ git apply /tmp/devel_binutils.patch error: patch failed: devel/binutils/Makefile:1 error: devel/binutils/Makefile: patch does not apply slippy$ I'll try to rework it to make git happy.
I managed to use patch(1) to apply it. I will push this commit upon the successful completion of an exp-run. Assigning to portmgr for this task. @portmgr, assign this ticket back to me when the exp-run has completed.
This needs to be build tested on 12.4-RELEASE and 14-CURRENT.
Please provide a pach that can be applied either using git apply or git am
Created attachment 243770 [details] Updated patch file Regenerate patch. It seems ports 182015786a35 make oritinal patch unapplicable.
Same problem as before. slippy$ git am /tmp/devel_binutils.patch Applying: devel/binutils: Update to 2.41 error: patch failed: devel/binutils/Makefile:1 error: devel/binutils/Makefile: patch does not apply Patch failed at 0001 devel/binutils: Update to 2.41 hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". slippy$ lh /tmp/devel_binutils.patch -rw-r--r-- 1 cy wheel 5.4K Aug 1 07:49 /tmp/devel_binutils.patch slippy$ slippy$ git apply /tmp/devel_binutils.patch error: patch failed: devel/binutils/Makefile:1 error: devel/binutils/Makefile: patch does not apply slippy$
Never mind. It applies to my development tree but not to my day-to-day tree.
(In reply to Cy Schubert from comment #6) With ports 6226965770f0 updated patch works fine with both 'git apply' and 'git am'. yasu@rolling-vm-freebsd2[1156]% pwd ~/tmp /home/yasu/tmp yasu@rolling-vm-freebsd2[1157]% wget -O binutils.patch 'https://bz-attachments.freebsd.org/attachment.cgi?id=243770' ~/tmp --2023-08-02 00:07:35-- https://bz-attachments.freebsd.org/attachment.cgi?id=243770 Resolving bz-attachments.freebsd.org (bz-attachments.freebsd.org)... 2610:1c1:1:606c::50:3, 96.47.72.106 Connecting to bz-attachments.freebsd.org (bz-attachments.freebsd.org)|2610:1c1:1:606c::50:3|:443... connected. HTTP request sent, awaiting response... 200 OK Cookie coming from bz-attachments.freebsd.org attempted to set domain to bugs.freebsd.org Length: unspecified [text/plain] Saving to: ‘binutils.patch’ binutils.patch [ <=> ] 5.42K --.-KB/s in 0s 2023-08-02 00:07:36 (57.9 MB/s) - ‘binutils.patch’ saved [5545] yasu@rolling-vm-freebsd2[1158]% cd /usr/ports ~/tmp yasu@rolling-vm-freebsd2[1159]% git show | grep '^commit' /usr/ports commit 6226965770f0 yasu@rolling-vm-freebsd2[1160]% git apply ~/tmp/binutils.patch /usr/ports yasu@rolling-vm-freebsd2[1161]% git restore . /usr/ports yasu@rolling-vm-freebsd2[1162]% git am ~/tmp/binutils.patch /usr/ports Applying: devel/binutils: Update to 2.41 yasu@rolling-vm-freebsd2[1163]
(In reply to Cy Schubert from comment #7) OK, I overlooked comment #7.
Approving the commit if the exp-run passes without error or errors are mitigated.
Some new failure logs: https://pkg-status.freebsd.org/package22/data/132amd64-default-foo/2023-08-03_07h56m23s/logs/errors/lfortran-0.19.0_2.log https://pkg-status.freebsd.org/package22/data/132amd64-default-foo/2023-08-03_07h56m23s/logs/errors/avidemux-2.8.1_2.log https://pkg-status.freebsd.org/package22/data/132amd64-default-foo/2023-08-03_07h56m23s/logs/errors/ipxe-g20230719,1.log https://pkg-status.freebsd.org/package22/data/132amd64-default-foo/2023-08-03_07h56m23s/logs/errors/uefi-edk2-bhyve-csm-0.2_4,1.log https://pkg-status.freebsd.org/package22/data/132amd64-default-foo/2023-08-03_07h56m23s/logs/errors/node16-16.20.1.log https://pkg-status.freebsd.org/package22/data/132amd64-default-foo/2023-08-03_07h56m23s/logs/errors/node18-18.16.1.log Around 100 ports were skipped due to those failures
FFmpeg: https://git.alpinelinux.org/aports/commit/community/ffmpeg?id=7dbeb0cafe6218d8e82e0f615e237471ed23ff05
(In reply to Daniel Engberg from comment #12) Thanks! I'm working to fix build error of multimedia/avidemux.
Created attachment 245872 [details] Updated patch file Add upstream patch to fix build error of sysutils/uefi-edk2-bhyve-csm.
(In reply to Antoine Brodin from comment #11) With ports 88d031b44927 and attachment 245872 [details] all build errors listed in comment #11 are fixed. So would you please try another exp-run? Regards.
New failure logs: https://pkg-status.freebsd.org/pb2/data/124i386-default-foo/2023-11-18_20h12m30s/logs/errors/ncid-1.11_1.log https://pkg-status.freebsd.org/package22/data/132amd64-default-foo/2023-11-18_20h12m39s/logs/errors/elf-dissector-0.0.1_2.log
Created attachment 247721 [details] patch for INFO option patch for INFO option that should be merged into update-2.41 patch
Created attachment 248253 [details] Updated patch file Fix build of devel/elf-dissector.
(In reply to Antoine Brodin from comment #16) Build of devel/elf-dissector is fixed with latest patch, and comms/ncid is removed from ports tree with ports d897f7a4c43c. So would you please try another exp-run? Regards.
(In reply to firk from comment #17) Please submit your patch as separate bug report as there is nothing to do with updating to 2.41.
(In reply to Yasuhiro Kimura from comment #20) No, it is. It updates INFO option support from 2.40 to 2.41. 2.41 won't build with unchecked INFO otherwise.
GNU Binutils 2.42 Released https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00016.html