[25.12] php8: backports of dependency and small maintainance cleanups #28430
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The php8 Makefile is already quite large. To improve readability, move config section to a separate 'Config.in' file. To ensure that the PHP8 option is only saved in '.config' if PHP8 has been selected for building. A depends on 'PACKAGE_php8' is added to the configuration option in the 'Config.in' file. Signed-off-by: Florian Eckert <fe@dev.tdt.de> (cherry picked from commit 74a3da9)
Switch to a single CONFIG_ per line, and alphabetize. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> (cherry picked from commit 8d7faa2)
xmlreader was selecting package php8-mod-dom as well as depending on PHP8_DOM, while php8-mod-dom also depended on PHP8_DOM (and therefore selected PHP8_DOM when php8-mod-dom was selected). This is a Kconfig recursive dependency, so break the recursion by noting that because php8-mod-xmlreader selects php8-mod-dom, PHP8_DOM is a transitive depends, so php8-mod-xmlreader should not depend on PHP8_DOM itself. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> (cherry picked from commit 247c1a1)
Add more menuconfig help text descriptions, and convert some mixed tabs and spaces to spaces. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> (cherry picked from commit 1a01a17)
* Add a needed BUILD_DEPENDENCY on icu package, when PHP8_INTL is defined. * Make PHP8_DOM selecting PHP8_LIBXML instead of depending on it. * PHP8_INTL does not depend on PHP8_GETTEXT, it builds also without gettext. * Always show option for choosing PHP8_FULLUCIDATA * For php8-cgi, php-cli, etc, a libstdcpp dependency is only gained when PHP8_INTL is selected, therefore update those conditional depends. As some combinations of these changes can change the binaries output, PKG_RELEASE has been bumped. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> Signed-off-by: Michael Heimpold <mhei@heimpold.de> (cherry picked from commit f8b8ce6)
- align the config option names - re-order the configuration options - add some help text - drop obsolete notes regarding older PHP versions and obsolete CONFLICT - remove (meanwhile) unrecognized configure options Signed-off-by: Michael Heimpold <mhei@heimpold.de> (cherry picked from commit 551e00c)
Contributor
|
@mhei Thanks! This will make testing backports of Zabbix frontend easier 😉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📦 Package Details
Maintainer: me
Description:
This PR backports the latest changes for PHP8 on main branch.
@danielfdickinson : FYI
🧪 Run Testing Details
✅ Formalities