Mercurial > hg > release > icedtea7-2.2

changeset 2511:0b6840181a0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix pulse audio header generation problem.
author Denis Lila <dlila@redhat.com>
date Fri, 10 Jun 2011 16:21:38 -0400
parents 47858baedb86
children 7dfe4a768671
files ChangeLog Makefile.am
diffstat 2 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 16 14:52:54 2012 +0100
+++ b/ChangeLog	Fri Jun 10 16:21:38 2011 -0400
@@ -1,3 +1,10 @@
+2011-06-10  Denis Lila  <dlila@redhat.com>
+
+	* Makefile.am
+	(stamps/pulse-java-headers.stamp): Prepend the java build directory
+	to the boot class path to avoid generating headers for the system
+	pulse-java classes.
+
 2012-02-16  Xerxes Rånby  <xerxes@zafena.se>
 
 	(HOTSPOT_CHANGESET): Add latest Zero HS22 fixes.
--- a/Makefile.am	Thu Feb 16 14:52:54 2012 +0100
+++ b/Makefile.am	Fri Jun 10 16:21:38 2011 -0400
@@ -1838,15 +1838,15 @@
 
 stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
 	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.EventLoop ;
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.Stream
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.Operation
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.PulseAudioSourcePort
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.PulseAudioTargetPort
 	mkdir -p stamps
 	touch $@