Re: [PULL] Server build fixes

2011-03-03 Thread Keith Packard
On Thu, 3 Mar 2011 20:42:55 -0800, Dan Nicholson wrote: > I think your original patch is the right way to go. Merged. 705f047..628d16a master -> master -- keith.pack...@intel.com pgpXnnWjnLLDe.pgp Description: PGP signature ___ xorg-devel@list

Re: [PULL] Server build fixes

2011-03-03 Thread Dan Nicholson
On Thu, Mar 3, 2011 at 2:10 PM, Keith Packard wrote: > On Sat, 26 Feb 2011 11:01:38 -0800, Dan Nicholson wrote: > >> It should get run every time config.status is run, which is every time >> configure runs. So, sdksyms.dep should get updated exactly when the >> Makefiles do. I do agree that sdksy

Re: [PULL] Server build fixes

2011-03-03 Thread Keith Packard
On Sat, 26 Feb 2011 11:01:38 -0800, Dan Nicholson wrote: > It should get run every time config.status is run, which is every time > configure runs. So, sdksyms.dep should get updated exactly when the > Makefiles do. I do agree that sdksyms.c shouldn't be shipped in the > tarball, but I think it s

Re: [PULL] Server build fixes

2011-02-27 Thread Keith Packard
On Sun, 27 Feb 2011 14:29:30 -0800, Dan Nicholson wrote: > I rolled Keith's diff in with my own and added the fix of actually > making sdksyms.dep be a prerequisite for sdksyms.c. I think that should > fix all the cases. Actually, I'm wondering if sdksyms.dep isn't needed if we add an explicit d

Re: [PULL] Server build fixes

2011-02-27 Thread Dan Nicholson
On Sun, Feb 27, 2011 at 03:26:32AM +0100, Cyril Brulebois wrote: > Hi, > > Keith Packard (26/02/2011): > > I read through the automake docs and they suggest placing a > > dependency on the generated configuration header file. We've got > > several, but there's the auto-generated do-not-use-config

Re: [PULL] Server build fixes

2011-02-26 Thread Cyril Brulebois
Hi, Keith Packard (26/02/2011): > I read through the automake docs and they suggest placing a > dependency on the generated configuration header file. We've got > several, but there's the auto-generated do-not-use-config.h which > holds all of the cpp defines which sdksyms.c may use. > > I think

Re: [PULL] Server build fixes

2011-02-26 Thread Cyril Brulebois
Dan Nicholson (26/02/2011): > And when I run make, sdksyms.sh is run first and then sdksyms.c is > built. Can you check if that's the case on your error? Or, if you > manually run sdksyms.sh again, does the error go away? You may be > right, though. sdksyms.c doesn't explicitly depend on sdksyms.d

Re: [PULL] Server build fixes

2011-02-26 Thread Dan Nicholson
On Sat, Feb 26, 2011 at 10:31 AM, Keith Packard wrote: > On Sat, 26 Feb 2011 15:33:20 +0100, Cyril Brulebois wrote: > >> I fear that the sdksyms part is broken. If one builds with some >> options different than the ones used to generate the tarball, the file >> isn't generated again, leading to s

Re: [PULL] Server build fixes

2011-02-26 Thread Dan Nicholson
On Sat, Feb 26, 2011 at 6:33 AM, Cyril Brulebois wrote: > Hi, > > Keith Packard (25/02/2011): >> On Fri, 25 Feb 2011 06:43:58 -0800, Dan Nicholson >> wrote: >> >> > Dan Nicholson (2): >> >       xfree86: Allow sdksyms.dep to be included portably >> >       dmx: Construct paths in doxygen.conf t

Re: [PULL] Server build fixes

2011-02-26 Thread Keith Packard
On Sat, 26 Feb 2011 15:33:20 +0100, Cyril Brulebois wrote: > I fear that the sdksyms part is broken. If one builds with some > options different than the ones used to generate the tarball, the file > isn't generated again, leading to such issues. Looks like sdksyms.c should be stuck in nodist_li

Re: [PULL] Server build fixes

2011-02-26 Thread Cyril Brulebois
Hi, Keith Packard (25/02/2011): > On Fri, 25 Feb 2011 06:43:58 -0800, Dan Nicholson wrote: > > > Dan Nicholson (2): > > xfree86: Allow sdksyms.dep to be included portably > > dmx: Construct paths in doxygen.conf to fix VPATH builds > > Merged. >780a77a..6b951de master -> maste

Re: [PULL] Server build fixes

2011-02-25 Thread Keith Packard
On Fri, 25 Feb 2011 06:43:58 -0800, Dan Nicholson wrote: > Dan Nicholson (2): > xfree86: Allow sdksyms.dep to be included portably > dmx: Construct paths in doxygen.conf to fix VPATH builds Merged. 780a77a..6b951de master -> master -- keith.pack...@intel.com pgpOEr02XLbPd.pgp

Re: [PULL] Server build fixes

2011-02-25 Thread Gaetan Nadon
On Fri, 2011-02-25 at 11:02 -0800, Keith Packard wrote: > Right, this fails only when building out-of-tree directly from git, > not > From a tarball. > The doxygen generated html files are stuffed in the tarball. Doxygen is not invoked when building from a tarball. signature.asc Description:

Re: [PULL] Server build fixes

2011-02-25 Thread Keith Packard
On Fri, 25 Feb 2011 18:03:44 +, Daniel Stone wrote: > Try doing the initial ./configure from out-of-tree: it should fail > then. Right, this fails only when building out-of-tree directly from git, not From a tarball. The fix isn't perfect -- there's a missing dependency issue which can be s

Re: [PULL] Server build fixes

2011-02-25 Thread Gaetan Nadon
On Fri, 2011-02-25 at 08:59 -0800, Keith Packard wrote: > So, I'm a bit confused here -- I do 'make distcheck' to build > releases, > and it works for me. I'd like to know how I can test this patch to > make > sure it does what you expect. > The failing scenario involves builds where srcdir != b

Re: [PULL] Server build fixes

2011-02-25 Thread Daniel Stone
On Fri, Feb 25, 2011 at 09:53:00AM -0800, Keith Packard wrote: > On Fri, 25 Feb 2011 18:04:56 +0100, Cyril Brulebois wrote: > > Keith Packard (25/02/2011): > > > So, I'm a bit confused here -- I do 'make distcheck' to build > > > releases, and it works for me. I'd like to know how I can test this

Re: [PULL] Server build fixes

2011-02-25 Thread Keith Packard
On Fri, 25 Feb 2011 18:04:56 +0100, Cyril Brulebois wrote: > Keith Packard (25/02/2011): > > So, I'm a bit confused here -- I do 'make distcheck' to build > > releases, and it works for me. I'd like to know how I can test this > > patch to make sure it does what you expect. > > Do you end up bui

Re: [PULL] Server build fixes

2011-02-25 Thread Cyril Brulebois
Keith Packard (25/02/2011): > So, I'm a bit confused here -- I do 'make distcheck' to build > releases, and it works for me. I'd like to know how I can test this > patch to make sure it does what you expect. Do you end up building with devel docs, so with doxygen support when you're running make

Re: [PULL] Server build fixes

2011-02-25 Thread Keith Packard
On Fri, 25 Feb 2011 06:43:58 -0800, Dan Nicholson wrote: > dmx: Construct paths in doxygen.conf to fix VPATH builds > > The paths in doxygen.conf assumed that srcdir=builddir and broke > otherwise. Use autoconf to fill in the paths to the srcdir so that the > files can be found