Opened 14 years ago

Last modified 12 years ago

#26045 new enhancement

muniversal: Destroot should ignore white space when comparing configuration files for merge

Reported by: mcl_guard-netmail@… Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version: 1.9.1
Keywords: muniversal Cc: MarcusCalhoun-Lopez (Marcus Calhoun-Lopez), ryandesign (Ryan Carsten Schmidt), cooljeanius (Eric Gallager)
Port:

Description

Target org.macports.destroot fails if files such as curl-config differ between configurations even by white space only. This isn't necessary as white space is unimportant in such files.

Attachments (2)

curl-config (4.4 KB) - added by mcl_guard-netmail@… 14 years ago.
destroot-i386 curl-config
curl-config.2 (4.4 KB) - added by mcl_guard-netmail@… 14 years ago.
destroot-x86_64 curl-config

Download all attachments as: .zip

Change History (6)

comment:1 Changed 14 years ago by jmroot (Joshua Root)

Cc: mcalhoun@… added
Component: baseports
Keywords: muniversal added
Port: any removed
Summary: Destroot should ignore white space when comparing configuration files for mergemuniversal: Destroot should ignore white space when comparing configuration files for merge

comment:2 Changed 14 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: ryandesign@… added

Why would the whitespace differ? Can you attach your curl-config files that differed only in whitespace? I've not seen that happen before.

Changed 14 years ago by mcl_guard-netmail@…

Attachment: curl-config added

destroot-i386 curl-config

Changed 14 years ago by mcl_guard-netmail@…

Attachment: curl-config.2 added

destroot-x86_64 curl-config

comment:3 in reply to:  2 Changed 14 years ago by mcl_guard-netmail@…

Replying to ryandesign@…:

Why would the whitespace differ? Can you attach your curl-config files that differed only in whitespace? I've not seen that happen before.

Some ports such as curl produce references to "host_alias=" or "host=" in the configuration file for universal builds. If these are removed without removing the leading space it produces the effect otherwise this does not seem to happen. Inserting the following in the post-configure section of the curl port file generates the effect.

        reinplace -E {s|\'--host=[^\']+\'||g} \
            ${dir}/curl-config \
            ${dir}/libcurl.pc
        
        reinplace -E {s|\'host_alias=[^\']+\'||g} \
            ${dir}/curl-config \
            ${dir}/libcurl.pc

I have since done the obvious and changed the the regex to remove the space before the parameter. Ideally, white space shouldn't be a factor for the comparison it the first place. I've attached a the files responsible for the record.

comment:4 Changed 12 years ago by cooljeanius (Eric Gallager)

Cc: egall@… added

Cc Me!

Note: See TracTickets for help on using tickets.