sdt patches split up for 6 and 7

[Mark Wielaard]

On Fri, 2012-08-17 at 08:00 -0400, Andrew Hughes wrote:
> ----- Original Message -----
> > On Thu, 2012-08-16 at 19:29 -0400, Andrew Hughes wrote:
> > > > I assume this is fine for 6, since there is no release pending. I
> > > > didn't see a release branch for the icedtea7 tree yet (I assume
> > > > that would
> > > > be called release/icedtea7-2.3), so I am waiting for that to be
> > > > created
> > > > to check this in (only on trunk, it isn't very important to get
> > > > into a
> > > > release soon, it is mainly cleanup, no functional changes except
> > > > for
> > > > the addition of an extra testcase).
> > 
> > Just to be clear I am not checking in code at an inopportune time.
> > Is the above OK?
> 
> Depends what we're talking about.  IcedTea6 fine, please wait for 7
> to branch (I'll try and get to it this afternoon, but the weekend
> is nearly here already...)

I have pushed to 6, will wait till the branch is ready for 7.

> For 7, I'd rather the code changes were in the forest and IcedTea7
> just set the right options.  See below.

I am somewhat inexperienced with coding against the forest. I rather
first have it in the tree to be sure it works out all right. Then do it
in the forest to compare.

> > When proposing the patch on hotspot-dev I moved the conditional into
> > the
> > hotspot build make files (that is patches/sdt-make.patch). So it get
> > build when sys/sdt.h is available and you can disable it, or point at
> > a
> > non-standard location, by setting SDT_H_FILE (yeah, not as nice as in
> > icedtea currently, but that is all the hotspot build infrastructure
> > really offers).
> 
> 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.

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

Cheers,

Mark