Repository navigation
lib: put the configured service files into glibj.zip - #63
Merged
Merged
Conversation
This was referenced Oct 14, 2026
duncanmcqueen
marked this pull request as ready for review
October 14, 2026 23:52
guillerodriguez
requested changes
Oct 15, 2026
duncanmcqueen
force-pushed
the
fix-service-files
branch
from
October 15, 2026 13:51
67f639c to
af91ce0
Compare
Contributor
|
@duncanmcqueen this is the next one we'd like to merge; please check the requested changes and let me know what you think. |
The resources rule copies META-INF from the source tree and skips the *.in templates. In an out-of-tree build the files that configure makes from those templates are in the build tree, so glibj.zip did not get them: java.util.prefs.PreferencesFactory, javax.sound.sampled.spi.AudioFileReader and javax.sound.sampled.spi.MixerProvider. (If the source tree was also configured, glibj.zip got the stale copies from there.) Also copy the configured files from the build tree. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: duncanmcqueen <dwmcqueen@gmail.com>
duncanmcqueen
force-pushed
the
fix-service-files
branch
from
October 15, 2026 15:28
af91ce0 to
3588c60
Compare
guillerodriguez
approved these changes
Oct 15, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Split from #59.
Problem and fix
configuremakes three service files from.intemplates:META-INF/services/java.util.prefs.PreferencesFactoryMETA-INF/services/javax.sound.sampled.spi.AudioFileReaderMETA-INF/services/javax.sound.sampled.spi.MixerProviderThe
resourcesrule inlib/Makefile.amcopiesMETA-INFfrom the source tree and skips the*.infiles. In an out-of-tree build, the configured files are in the build tree, not in the source tree. Thusglibj.zipdoes not contain them. (If the source tree was also configured before,glibj.zipgets the old copies from the source tree.)Then, for example,
AudioSystemhas noAudioFileReader, and it cannot read WAV or AU files.The CI builds in the source tree. Thus the CI does not show the problem.
This change also copies the configured files from the build tree.
How to reproduce
Then run this test:
WavFileFormat.javaResults
Linux x86_64, ingelabs/classpath
master(0406074), JamVMmaster,javacfrom JDK 8, autoconf 2.73, automake 1.19, theconfigureoptions of the CI Linux job, out-of-tree build. "Before" ismaster. "After" ismasterwith this commit.Platforms
Not specific to Haiku. The problem occurs with all out-of-tree builds. I reproduced it on Linux.
AI assistance
An AI model (Claude Code, by Anthropic) wrote this change, the test and this text. The repository owner directed the work and checked the results. Please review it as you review other contributions.
🤖 Generated with Claude Code