gdal +universal fails to patch cpl_config.h on 32-bit systems

[pt.responder@…]

patching file port/cpl_config.h
Hunk #1 FAILED at 143.
1 out of 1 hunk FAILED -- saving rejects to file port/cpl_config.h.rej
shell command "cd /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_gis_gdal/work/gdal-1.7.3 && patch -p0 < /opt/local/var/macports/sources/rsync.macports.org/release/ports/gis/gdal/files/patch_cpl_config_h" returned error 1

[Veence (Vincent)]

I cannot reproduce this

-> port -v build gdal
--->  Computing dependencies for gdal.
--->  Fetching gdal
--->  Verifying checksum(s) for gdal
--->  Checksumming gdal-1.7.3.tar.gz
--->  Extracting gdal
--->  Extracting gdal-1.7.3.tar.gz

[…]

  Statically link PROJ.4:    yes
  enable OGR building:       yes
  enable pthread support:    no
  hide internal symbols:     no

patching file port/cpl_config.h
--->  Building gdal

[pt.responder@…]

main.log of build process

[pt.responder@…]

build on 32 bit intel using ccache using gcc 4.0

[Veence (Vincent)]

I'll test that on an old Mac Mini tomorrow and see if I get the same error.

[ryandesign (Ryan Carsten Schmidt)]

The problem only occurs when using the universal variant, on a computer where configure does not determine that SIZEOF_UNSIGNED_LONG and SIZEOF_VOIDP are both 8 -- in other words, on 32-bit machines like PowerPC G4 (not G5) and Intel Core (not Core 2) processors.

The whole point of the configure script is to discover values like this that differ by machine, so it doesn't make sense to then try to apply a patch on top of that; it can't help but fail in some cases. This is why we do this kind of after-the-fact changing of the values the configure script found by using an ed script, not a patch. See glib2, neon, lzo, etc. for examples.

The problem changes were made to the port in r46597.

[ryandesign (Ryan Carsten Schmidt)]

Issue confirmed on my Power Mac G4 with Leopard.

[Veence (Vincent)]

I have updated the build system to adopt the 'ed' file paradigm. Please update and try again.

[ryandesign (Ryan Carsten Schmidt)]

Thanks, confirmed that r74405 + r74406 do fix this.

[pt.responder@…]

Confirmed fixed many thanks. Paula