Mercurial > hg > release > icedtea7-2.0
view patches/boot/explicit-inner-class-headers.patch @ 2462:3ac37175420b
Allow bootstrap build to work with current GNU Classpath CVS.
2011-08-03 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Apply explicit-inner-class-headers patch as required.
* acinclude.m4: Test for PR classpath/45526
explicitly instead of assuming it is present
when the other bugs are (not true with current
Classpath CVS).
* patches/boot/explicit-inner-class-headers.patch:
Split out from javah.patch so as to apply when other
bugs aren't present.
* patches/boot/javah.patch:
Remove above patch.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 03 Aug 2011 17:58:24 +0100 |
| parents | |
| children |
line wrap: on
line source
diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk --- openjdk-boot.orig/jdk/make/common/Rules.gmk 2009-12-13 20:37:41.000000000 +0000 +++ openjdk-boot/jdk/make/common/Rules.gmk 2009-12-13 21:11:04.000000000 +0000 @@ -303,7 +303,11 @@ $(prep-target) @$(ECHO) "# Running javah:" $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ - $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) + $(CLASSES.export) + $(foreach innerclass,$(subst $$,\$$,$(EXPORTED_inner)), \ + $(JAVAH_CMD) \ + -o $(CLASSHDRDIR)/$(subst .,_,$(subst \$$,_,$(innerclass))).h \ + $(innerclass)) @$(java-vm-cleanup) @$(TOUCH) $@ diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk --- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-04 23:26:35.000000000 +0000 +++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-13 21:11:04.000000000 +0000 @@ -189,3 +189,5 @@ java/awt/dnd/DnDConstants.java \ sun/awt/CausedFocusEvent.java +EXPORTED_inner = \ + sun.java2d.opengl.OGLContext$$OGLContextCaps