icedtea-1.14 JamVM + OpenJDK 7 -version patch

[Dr Andrew John Hughes]

On 15:48 Fri 27 May     , Xerxes Rånby wrote:

snip...

> > >  
> > > -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.
> 

Ok, I see it now.  I think we just need:

stamps/patch-fsg.stamp: stamps/extract.stamp

sanitise-openjdk is included by extract, and patch depends on patch-fsg.

> 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
> 

Well, yeah, 6 is quite different.  7 is arguably cleaner, this just happened
to slip throught the net.

> 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.
> 

We don't have fonts.stamp so that would probably be why... :-)
I'm not sure if that's not just something that should go in the forest directly.

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

No, the fix is to change patch-fsg as above.  That would create a circular dependency
as extract depends on sanitise-openjdk.  Plus sanitise-openjdk should only depend on
the openjdk tree.

> 
> > >  	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.
> 

It's probably just this fragment, and, if that fixes something in the jamvm build for you, it's fine by me.
I haven't really run the jamvm build for a long time.

> Cheers
> Xerxes
> 

Cheers,
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37