icedtea-1.14 JamVM + OpenJDK 7 -version patch

[Xerxes Rånby]

fre 2011-05-27 klockan 14:01 +0100 skrev Dr Andrew John Hughes:

> > * jamvm-oj7.patch :
> > OpenJDK7 complained that JVM_FindClassFromBootLoader not found inside
> > the jamvm libjvm.so, a new JVM API in OpenJDK 7, the attached patch fix
> > by implementing it using jamvm's internal findSystemClass0 method.
> > 
> 
> Are you planning to add this to the repo?
I was expectig Rob to merge this upstream as he now allready have
done :) Thanks Rob!
And then be able to pull it into icedtea next time when i bump the jamvm
revision.


> 
> > 
> > * icedtea-1.14-jamvm.patch :
> > I had to do some tweaks to the icedtea-1.14 Makefile.am all contained in
> > the icedtea-1.14-jamvm.patch because of a silly issue the jamvm sources
> > did not get extracted before patching.
> > This patch also makes it possible to rerun the stamps/jamvm.stamp by
> > adding -f to ln so that it can replace the symlink if its allready
> > there.
> 
> Comments on this below.
> 
> > OpenJDK 7 have added a check if the "unused by jamvm" libjsig.so
> > actually are a valid .so file, so instead of simply touching it i simply
> > created a link to the built libjvm.so created by stamps/jamvm.stamp.
> > 
> > 
> > I configured my icedtea-1.14 build using
> > ./configure --enable-jamvm --disable-system-lcms --disable-bootstrap
> > 
> 
> Wow, I'm surprised how few people have lcms2.

I have to congratulate the Fedora project for its superior
colormanagement support. For what I know Ubuntu will update to use the
same colormanagement functionality as Fedora have implemented starting
with the next 11.10 release. Many thanks to Till Kamppeter from the
Linux Foundation for informing and unifying colormanagement fuctionality
across the distributions.


> > Index: icedtea-1.14/Makefile.am
> > ===================================================================
> > --- icedtea-1.14.orig/Makefile.am	2011-05-26 11:18:03.468701462 +0200
> > +++ icedtea-1.14/Makefile.am	2011-05-26 12:18:33.610702371 +0200
> > @@ -1343,7 +1343,7 @@
> >  	rm -rf $(abs_top_builddir)/generated.build
> >  	rm -f stamps/generated.stamp
> >  
> > -stamps/patch-fsg.stamp: stamps/sanitise-openjdk.stamp
> > +stamps/patch-fsg.stamp: stamps/extract.stamp stamps/sanitise-openjdk.stamp
> 
> I'm puzzled why you need this.  sanitise-openjdk requires extract.

The examination are:
sanitise-openjdk only depend on extract-openjdk and extract-hotspot.
The "master" stamps/extract.stamp never gets processed.

The reason why icedtea6 happens to work are because extract.stamp hangs
at the end of a long dependency chain, i guess it gets run almost by
accident:
stamps/patch-fsg.stamp: stamps/fonts.stamp
stamps/fonts.stamp: stamps/generated.stamp
stamps/generated.stamp: stamps/ports.stamp
stamps/ports.stamp: stamps/replace-hotspot.stamp
stamps/replace-hotspot.stamp: stamps/extract.stamp

In icedtea 7  stamps/patch-fsg.stamp do not depend on stamps/fonts.stamp
so this chain of depends used in icedtea6 never gets run.

If you prefer i can change sanitise-openjdk to depend on
stamps/extract.stamp
it will fix this bug.

> >  	mkdir -p stamps ; \
> >  	rm -f stamps/patch.stamp.tmp ; \
> >  	touch stamps/patch.stamp.tmp ; \
> > @@ -2087,9 +2087,9 @@
> >  	$(MAKE) install
> >  	mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
> >  	cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
> > -	ln -s server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
> > +	ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
> >  	touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
> > -	touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
> > +	ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
> >  endif
> >  	mkdir -p stamps
> >  	touch stamps/jamvm.stamp
> 
> This is a straight backport from 6, so you may need to make changes there too.

I will prepare a icedtea6 backport patch when this new patch are clear
to go into icedtea 7.

Cheers
Xerxes