php74 @7.4.33_3+libedit: build/patch failed

[inveda-net]

:debug:patch Environment: 
:debug:patch CC_PRINT_OPTIONS='YES'
:debug:patch CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/php74-c391e882/work/.CC_PRINT_OPTIONS'
:debug:patch CPATH='/opt/local/include'
:debug:patch DEVELOPER_DIR='/Library/Developer/CommandLineTools'
:debug:patch LIBRARY_PATH='/opt/local/lib'
:debug:patch MACOSX_DEPLOYMENT_TARGET='15.0'
:debug:patch SDKROOT='/Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk'
:debug:patch SOURCE_DATE_EPOCH='1773697527'
:info:patch Executing:  cd "/opt/local/var/macports/build/php74-c391e882/work/php-7.4.33" && /usr/bin/patch -t -N -p1 < '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/lang/php/files/patch-php74-libxml.diff'
:debug:patch system:  cd "/opt/local/var/macports/build/php74-c391e882/work/php-7.4.33" && /usr/bin/patch -t -N -p1 < '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/lang/php/files/patch-php74-libxml.diff'
:info:patch patching file 'ext/dom/document.c'
:info:patch patching file 'ext/libxml/php_libxml.h'
:info:patch patching file 'ext/soap/php_sdl.c'
:info:patch 1 out of 1 hunks failed--saving rejects to 'ext/soap/php_sdl.c.rej'
:info:patch patching file 'ext/libxml/libxml.c'
:info:patch patching file 'ext/libxml/libxml.c'
:info:patch 1 out of 1 hunks failed--saving rejects to 'ext/libxml/libxml.c.rej'
:info:patch Command failed:  cd "/opt/local/var/macports/build/php74-c391e882/work/php-7.4.33" && /usr/bin/patch -t -N -p1 < '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/lang/php/files/patch-php74-libxml.diff'
:info:patch Exit code: 1
:error:patch Failed to patch php74: command execution failed
:debug:patch Error code: CHILDSTATUS 14450 1
:debug:patch Backtrace: command execution failed
:debug:patch     while executing
:debug:patch "system {*}$notty {*}$callback {*}$nice $fullcmdstring"
:debug:patch     invoked from within
:debug:patch "command_exec patch "" "< '$patch'""
:debug:patch     (procedure "portpatch::patch_main" line 41)
:debug:patch     invoked from within
:debug:patch "$procedure $targetname"

[ryandesign (Ryan Carsten Schmidt)]

Bjarne, the maintainers line in the php ports you took over is wrong. BjarneDMat needs to be changed to @BjarneDMat.

[BjarneDMat]

Thanks 👍🏻 I'll fix it in "step 10" from PR28140 along w/ some other, administrative stuff 🤓

[sbytnar (Steven Bytnar)]

Hi. The problem is that the patch file chunks that fail for php_sdl.c and libxml.c use spaces. The source code original uses tabs. Adding "-l" to patch fixes the problem. The patch file should be adjusted.

[BjarneDMat]

Thanks 👍🏻🥇 I had been staring myself blind trying to understand what went worng w/ those patches ... and - as usual - it's something simple 🤔👎🏻

[inveda-net]

Thanks, using patch.post_args="-l" on install fixed the problem, but afterwards the build failed on 'libxml.c'. Based on information from the net, ATTRIBUTE_UNUSED needs to be replaced by __attribute__((__unused__)). I locally edited the file and build/install finished successfully. Maybe someone could integrate this into the patches.

[BjarneDMat]

That's currently my job .. it's on my radar to fix the libxml2 problems in php74 & php80. Currently I'm working on getting the last of PR28140 merged.

And I'm verry 🙏🏻thankful🙏🏻 for your testing & research 🤓👍🏻

Please keep the tidbits comming ... 😉

[msbit (Tom Sullivan)]

@BjarneDMat would you like a PR wrapping up the changes mentioned by @sbytnar and @inveda-net ?

[BjarneDMat]

@msbit That would be nice 🙏🏻👍🏻

❓Have you testet this on php80 also 🤔 If memory serves me right, they have the same libxml2 patches ...

We are in the final stretches regarding getting PR28140 fully merged, so I'll take a look at this as the next item on my agenda 👍🏻

[BjarneDMat]

​https://github.com/macports/macports-ports/pull/31982
php{74,80}: fix libxml patch

​https://github.com/macports/macports-ports/pull/31963
Fix/php patch libxml

[ryandesign (Ryan Carsten Schmidt)]

Both of these PRs claim to resolve this ticket and make some of the same changes. Which PR is the one that we should be looking at? Can the other one be closed, or does it contain other important changes?

[BjarneDMat]

31982 supercedes 31963
31982 contains further fixes
31963 was the foundaition for 31982