sdt patches split up for 6 and 7

[Andrew Hughes]

----- Original Message -----
> On Fri, 2012-08-17 at 08:00 -0400, Andrew Hughes wrote:

snip...

> > So sounds like:
> > 
> > if ENABLE_SYSTEMTAP
> > ICEDTEA_PATCHES += patches/systemtap.patch
> > endif
> > 
> > can be replaced by:
> > 
> > if ENABLE_SYSTEMTAP
> > ICEDTEA_ENV += \
> > <whatever options enable SystemTap>
> > endif
> > 
> > No?
> 
> Yeah, even simpler even. If sys/sdt.h is there then the SDT support
> will
> be build in automatically. Only when you explicitly want to disable
> it
> do you need to set SDT_H_FILE to something non-existing.
> 

So you'd do:

if !ENABLE_SYSTEMTAP
ICEDTEA_ENV += \
  SDT_H_FILE=/i/dont/exist
endif

> > I'd prefer the actual code changes are in the forest so they get
> > merged
> > automatically when that is updated, not when IcedTea is built.
> >  They also
> > then show up in our diffs and we know they are not upstream.
> 
> Yeah, will place them there after the branch/release is complete.
> 

There seems to be some confusion.  There is still a branch yet to be
done for:

http://icedtea.classpath.org/hg/icedtea7/

A branch for the OpenJDK fork:

http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/{.,corba,jaxp,jaxws,langtools,jdk,hotspot}

has been in place for months and is now tagged for 2.3.

You want to commit to:

http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/

> Cheers,
> 
> Mark
> 

-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07