Skip to content

Revert "[PHP] Recompile PHP.wasm Node JSPI with MAIN_MODULE set to 2" - #3330

Merged
brandonpayton merged 1 commit into
trunkfrom
revert-main-module-2
Mar 3, 2026
Merged

brandonpayton merged 1 commit into
trunkfrom
revert-main-module-2

Conversation

@brandonpayton

@brandonpayton brandonpayton commented Mar 3, 2026 •

Copy link
Copy Markdown
Member

Motivation for the change, related issues

This reverts commit 17ece53. (#3244)

There are php-wasm build issues after this change. I initially tried to fix them with #3329, but some tests are still failing after successfully rebuilding everything. Let's revert to get the builds passing again.

cc @mho22

Implementation details

Revert the MAIN_MODULE=2 change.

Testing Instructions (or ideally a Blueprint)

  • CI

…3244)"

This reverts commit 17ece53.

There are php-wasm build issues after this change. Let's revert to get
the builds passing again.
@brandonpayton
brandonpayton requested a review from mho22 March 3, 2026 02:46
@brandonpayton brandonpayton self-assigned this Mar 3, 2026
@brandonpayton
brandonpayton requested a review from a team as a code owner March 3, 2026 02:46
Copilot AI review requested due to automatic review settings March 3, 2026 02:46
@brandonpayton brandonpayton changed the title Revert "[PHP] Recompile PHP.wasm Node JSPI with MAIN_MODULE set to 2 Revert "[PHP] Recompile PHP.wasm Node JSPI with MAIN_MODULE set to 2" Mar 3, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@brandonpayton

Copy link
Copy Markdown
Member Author

I may merge this yet this evening but am trying one last thing to fix the errors in #3329: Rebuild the intl extension for php-wasm/web.

@brandonpayton

Copy link
Copy Markdown
Member Author

@mho22 That didn't work, so I'll go ahead revert. That way, we can make other php-wasm updates while adjusting the MAIN_MODULE=2 changes.

@brandonpayton
brandonpayton merged commit 3caa1d4 into trunk Mar 3, 2026
42 checks passed
@brandonpayton
brandonpayton deleted the revert-main-module-2 branch March 3, 2026 05:31
brandonpayton pushed a commit that referenced this pull request Mar 3, 2026
## Motivation for the change, related issues

Based on the previous pull request :
#3244
And reverting it here :
#3330

And because I should have been more careful :

Now this pull request sets `MAIN_MODULE=2` to PHP.wasm Web JSPI and
PHP.wasm Node JSPI.

## Implementation details

Anything related to :
#3244

`+`

- Added a `__c_longjmp` condition since it is only needed for Xdebug [
PHP.wasm Node JSPI ]
- Added a `_wasm_recv` condition since it is only needed for Memcached [
PHP.wasm Node JSPI ]
- Modified extensions location in PHP.wasm Web 
- Recompiled PHP.wasm Node JSPI
- Rebuilt Intl for Web JSPI [ since it needs `/root/lib/libicuio.a` ]
- Recompiled PHP.wasm Web JSPI

## Testing Instructions (or ideally a Blueprint)

CI
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants