-
Notifications
You must be signed in to change notification settings - Fork 2k
Add Alpine 3.22 (remove Alpine 3.20) #1580
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
😞 😮 In file included from /usr/src/php/ext/opcache/jit/zend_jit.c:48:
ext/opcache/jit/zend_jit_trace.c: In function 'zend_jit_trace':
ext/opcache/jit/zend_jit_trace.c:6337:70: warning: 'gen_handler' may be used uninitialized [-Wmaybe-uninitialized]
6337 | (gen_handler || type == IS_UNKNOWN || !ra || !ra[ssa_op->result_def]));
ext/opcache/jit/zend_jit_internal.h:552:21: note: in definition of macro 'SET_STACK_TYPE'
552 | if (_set_mem_type) { \
| ^~~~~~~~~~~~~
In file included from /usr/src/php/ext/opcache/jit/zend_jit.c:4460:
ext/opcache/jit/zend_jit_trace.c:4288:30: note: 'gen_handler' was declared here
4288 | bool gen_handler;
| ^~~~~~~~~~~
/usr/src/php/ext/opcache/jit/zend_jit_x86.dasc: Assembler messages:
/usr/src/php/ext/opcache/jit/zend_jit_x86.dasc:2976: Error: @TLSGD operator requires `%rdi' as dest register
make: *** [Makefile:1303: ext/opcache/jit/zend_jit.lo] Error 1 |
(in which I yet again consider dropping |
🤔 👀 ❓ I found where the error is coming from, I think, but I don't know why or how to fix it. |
See PHP issue: php/php-src#18743 (comment) |
Follow-up on this: the fix got merged upstream in php-src, and the fix will be released with PHP 8.3.23 / PHP 8.4.9. |
Awesome, thanks for the quick fix @nielsdos! ❤️ 🙏 @tianon, should we backport the fix? (php/php-src@b3c8afe) |
(that's just a rebase for starters - we also need to decide what to do with 8.1 and 8.2 that didn't get a backported fix as far as I can see) |
Oh, and we have the patching issue that the code sticks around -- I'm guessing patching this during the build of |
8.1 & 8.2 are out of bugfix support. If the patch doesn't apply/work there, then I can provide a patchfile for those versions that you can apply (ping me in that case). |
Since 8.1 and 8.2 are out of bugfix support, we'll have to apply the backport ourselves until their end of life. As for extension time in |
@nielsdos looks like the upstream patch will work as-is for 8.2 and 8.3 (and the merge commit version in 8.4 - I'll push that change soon), but 8.1 needs something slightly different; would php/php-src@f171d5f be correct? did I miss anything? |
FWIW, that patch does appear to build successfully 😅 |
8efe17a
to
696a9fa
Compare
The patch to make it build on 8.1 seems right. |
Interesting, yeah -- in 8.2+ it appears that this was split specifically in part to set that value to 8 for Should I perhaps update my patch to backport that |
php/php-src@6b105d4 is what that looks like -- I copied the (The |
I've verified locally that using that new patch also appears to work fine and compile successfully, so if it's more technically correct I'm happy to commit that swap. 👍 ❤️ |
php/php-src@94ba883 is where this happened, specifically 👍 👀 |
(I'm now convinced enough that this is correct -- happy to hear dissent/feedback, though! ❤️) |
I checked this and it is right. It's indeed technically more correct. |
Perfect, thank you so much, @nielsdos! ❤️ |
Changes: - docker-library/php@98d7f098: Merge pull request docker-library/php#1580 from infosiftr/alpine3.22 - docker-library/php@9c90483c: Backport patches for Alpine 3.22 + ZTS - docker-library/php@904a84a1: Add Alpine 3.22 (remove Alpine 3.20)
No description provided.