Opened 2 years ago
Closed 2 years ago
#65750 closed defect (fixed)
mesa: no-missing-prototypes-error.patch fails to apply
| Reported by: | barracuda156 | Owned by: | jeremyhu (Jeremy Huddleston Sequoia) |
|---|---|---|---|
| Priority: | Normal | Milestone: | |
| Component: | ports | Version: | 2.7.2 |
| Keywords: | Cc: | ||
| Port: | mesa |
Description
Perhaps no-missing-prototypes-error.patch is meant for mesa 17.1.6? But it is sitting outside of the variant, so is used for both versions, and fails with 19.0.8:
---> Applying no-missing-prototypes-error.patch Executing: cd "/opt/local/var/macports/build/_opt_PPCRosettaPorts_x11_mesa/mesa/work/mesa-19.0.8" && /usr/bin/patch -p1 < '/opt/PPCRosettaPorts/x11/mesa/files/no-missing-prototypes-error.patch' patching file configure.ac Hunk #1 FAILED at 292. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej Command failed: cd "/opt/local/var/macports/build/_opt_PPCRosettaPorts_x11_mesa/mesa/work/mesa-19.0.8" && /usr/bin/patch -p1 < '/opt/PPCRosettaPorts/x11/mesa/files/no-missing-prototypes-error.patch' Exit code: 1
Change History (3)
comment:1 follow-up: 2 Changed 2 years ago by ryandesign (Ryan Carsten Schmidt)
comment:2 Changed 2 years ago by barracuda156
Replying to ryandesign:
Yes, the patch seems to be for mesa 17.1.6. By version 19.0.8 this section of configure.ac has been completely restructured, so I don't know if we need a new patch for that version or if the patch is no longer needed. Consult #46827 to see what problem the patch was originally intended to fix.
However, could you please say what OS version and architecture you observe this problem on, and whether you are overriding the compiler, editing the Portfile, or making any other unusual changes? I see from the path in your error message that you are probably cross compiling for PowerPC on an Intel Mac, probably running Mac OS X 10.6 based on your previous recent tickets. The patch is only applied when the compiler is gcc, which is evidently the case here, but the port is programmed to use mesa 17.1.6 on Mac OS X 10.6 and earlier and 19.0.8 on Mac OS X 10.7 and later, so if you're on 10.6 you should be getting mesa 17.1.6 not 19.0.8 and should not be seeing this problem. Attaching your main.log file may be helpful.
Thanks for responding! I have fixed 19.0.8 for 10.6 together with EGL for both mesa and libepoxy. Yes, that is on Rosetta. See: https://github.com/macports/macports-ports/pull/15965
(Patch should obviously be moved into 17.1.6 block, as-is it simply cannot be applied to 19.0.8, which does build with GCC.)
comment:3 Changed 2 years ago by kencu (Ken)
| Resolution: | → fixed |
|---|---|
| Status: | assigned → closed |
Yes, the patch seems to be for mesa 17.1.6. By version 19.0.8 this section of configure.ac has been completely restructured, so I don't know if we need a new patch for that version or if the patch is no longer needed. Consult #46827 to see what problem the patch was originally intended to fix.
However, could you please say what OS version and architecture you observe this problem on, and whether you are overriding the compiler, editing the Portfile, or making any other unusual changes? I see from the path in your error message that you are probably cross compiling for PowerPC on an Intel Mac, probably running Mac OS X 10.6 based on your previous recent tickets. The patch is only applied when the compiler is gcc, which is evidently the case here, but the port is programmed to use mesa 17.1.6 on Mac OS X 10.6 and earlier and 19.0.8 on Mac OS X 10.7 and later, so if you're on 10.6 you should be getting mesa 17.1.6 not 19.0.8 and should not be seeing this problem. Attaching your main.log file may be helpful.