#56515 closed defect (fixed)
gdal: patchfile does not apply
| Reported by: | ryandesign (Ryan Carsten Schmidt) | Owned by: | Veence (Vincent) |
|---|---|---|---|
| Priority: | Normal | Milestone: | |
| Component: | ports | Version: | |
| Keywords: | Cc: | ||
| Port: | gdal |
Description
---> Applying patch-netcdfdataset_cpp.diff DEBUG: Environment: CC_PRINT_OPTIONS='YES' CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_gis_gdal/gdal/work/.CC_PRINT_OPTIONS' CPATH='/opt/local/include' LIBRARY_PATH='/opt/local/lib' MACOSX_DEPLOYMENT_TARGET='10.8' Executing: cd "/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_gis_gdal/gdal/work/gdal-2.3.0" && /usr/bin/patch -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/gis/gdal/files/patch-netcdfdataset_cpp.diff' DEBUG: system: cd "/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_gis_gdal/gdal/work/gdal-2.3.0" && /usr/bin/patch -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/gis/gdal/files/patch-netcdfdataset_cpp.diff' patching file frmts/netcdf/netcdfdataset.cpp Hunk #1 FAILED at 4642. 1 out of 1 hunk FAILED -- saving rejects to file frmts/netcdf/netcdfdataset.cpp.rej Command failed: cd "/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_gis_gdal/gdal/work/gdal-2.3.0" && /usr/bin/patch -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/gis/gdal/files/patch-netcdfdataset_cpp.diff' Exit code: 1
Change History (8)
comment:1 Changed 6 years ago by Veence (Vincent)
comment:2 follow-up: 7 Changed 6 years ago by ryandesign (Ryan Carsten Schmidt)
Because you committed a change to the port, the buildbot will automatically try to build it again. You can see its progress in the buildbot waterfall. It may take an hour for the buildbot to get to building gdal, as it is currently busy building other ports.
Assuming the build is successful, you should make another commit to actually delete the patchfile from the files directory.
Next time please use the ticket URL in the commit message, so that the commit can be automatically mentioned in the ticket. See CommitMessages.
comment:3 Changed 6 years ago by Veence (Vincent)
Oh, I just realized that this patch was applied even when netcdf wasn't requested with the corresponding variant, which is a bug. All right, I will monitor the buildbot.
Also, yes, I didn't remove the patch file in case the build would fail. This was deliberate, as well as not closing the ticket as long as I’m not sure it’s fixed.
Thanks Ryan for your constant attention.
comment:5 Changed 6 years ago by ryandesign (Ryan Carsten Schmidt)
Certainly by removing the patchfile, you fixed the problem that the patchfile did not apply. Whether or not the patchfile was still needed I cannot say. But it looks like you added it in order to help pre-C++11 systems, and now that gdal doesn't support pre-C++11 systems anymore, it seems like the patch should no longer be needed.
comment:6 Changed 6 years ago by Veence (Vincent)
| Resolution: | → fixed |
|---|---|
| Status: | assigned → closed |
Seems reasonable. Closing this ticket.
comment:7 Changed 6 years ago by ryandesign (Ryan Carsten Schmidt)
Replying to ryandesign:
Assuming the build is successful, you should make another commit to actually delete the patchfile from the files directory.
Do you want to delete the patchfile?
comment:8 Changed 6 years ago by ryandesign (Ryan Carsten Schmidt)
You removed the patchfile in [62cc698a512b406125a139d1a757f4a555112468/macports-ports].
The patch is probably obsolete. However, I have not access to a pre-stdc++ environment, so I’m unable to test it. I removed the line which pulled in the patch [afb53b6dbdc3d9803088b167d821fd1f69b96a9c/macports-ports]. Could you try again? Thanks