From 3588c6030ceab2bb731108eff5ae1f992b067c2f Mon Sep 17 00:00:00 2001 From: duncanmcqueen Date: Wed, 14 Oct 2026 08:26:59 -0500 Subject: [PATCH] lib: put the configured service files into glibj.zip 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 Signed-off-by: duncanmcqueen --- lib/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/Makefile.am b/lib/Makefile.am index 68fed75648..a52b3f2f71 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -98,6 +98,12 @@ resources: copy-vmresources.sh if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \ cp $(top_srcdir)/resource/$$p $$p; \ done + @list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name \*\.in -print`; for p in $$list; do \ + f=`echo $$p | sed -e 's/\.in$$//'`; \ + dirname=`dirname $$f`; \ + if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \ + if test -f $(top_builddir)/resource/$$f; then cp $(top_builddir)/resource/$$f $$f; fi; \ + done @$(SHELL) ./copy-vmresources.sh @list=`cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print`; for p in $$list; do \ dirname=`dirname $$p`; \