Re: build problems in programs/xfs

2005-01-23 Thread Mark Vojkovich
On Sat, 22 Jan 2005, Marc Aurele La France wrote:

 It would seem that you are building with SharedLibFont explicitly set to NO,
 which is the default on a Debian system (see linux.cf).  The attached, which
 I've just committed, should fix this problem.

  I wonder if Thomas's problems are related to the ones I'm seeing.
I just synced up today but the problem I've been seeing is still there.
I don't use a font server though.

  Which library is the one in question?  fontenc? fonteconfig?  I can
try replacing it with one from an older build on another machine.


Mark.
___
Devel mailing list
Devel@XFree86.Org
http://XFree86.Org/mailman/listinfo/devel


Re: build problems in programs/xfs

2005-01-23 Thread Marc Aurele La France
On Sun, 23 Jan 2005, Mark Vojkovich wrote:
On Sat, 22 Jan 2005, Marc Aurele La France wrote:
It would seem that you are building with SharedLibFont explicitly set to NO,
which is the default on a Debian system (see linux.cf).  The attached, which
I've just committed, should fix this problem.

 I wonder if Thomas's problems are related to the ones I'm seeing.
I just synced up today but the problem I've been seeing is still there.
I don't use a font server though.

 Which library is the one in question?  fontenc? fonteconfig?  I can
try replacing it with one from an older build on another machine.
That would be libXfont, as mentioned earlier.
But I've already tried that with no success.  Tomorrow, I'll try a more brute 
force approach at determining what the fontset problem is.

Marc.
+--+---+
|  Marc Aurele La France   |  work:   1-780-492-9310   |
|  Computing and Network Services  |  fax:1-780-492-1729   |
|  352 General Services Building   |  email:  [EMAIL PROTECTED]  |
|  University of Alberta   +---+
|  Edmonton, Alberta   |   |
|  T6G 2H1 | Standard disclaimers apply|
|  CANADA  |   |
+--+---+
XFree86 developer and VP.  ATI driver and X server internals.
___
Devel mailing list
Devel@XFree86.Org
http://XFree86.Org/mailman/listinfo/devel


Re: build problems in programs/xfs

2005-01-22 Thread Marc Aurele La France
On Sat, 22 Jan 2005, Thomas Dickey wrote:
On Fri, 21 Jan 2005, Marc Aurele La France wrote:
On Fri, 21 Jan 2005, Thomas Dickey wrote:
On Fri, 21 Jan 2005, Marc Aurele La France wrote:
On Fri, 21 Jan 2005, Thomas Dickey wrote:
No one seems to have run into this one, but it's been broken for (me at 
least)
for the past couple of weeks.  Ifdef'ing out the conflicting code gets 
it to
build; I'm not sure which change caused it:

Silly question, maybe, but is this from a fresh checkout?

no - I did cvs updates from September (every couple of weeks).
The previous working build I have is from December 22.

Did you `make World`?

yes, that's what I always do.

What sort of change would break an update?

Oh, there are plenty of possibilities, especially if you build in the 
checked out tree, a practice I don't recommend.

my practice has been to do a build on a clean up-to-date tree to see what
problems there are.  Offhand, about 10% of the builds fail due to some
issue; most are commented on and resolved within a couple of days.

This particular one's cause isn't apparent - seemed to be some mismatch
between 32-bit and 64-bit ifdef's, but checking for the related files didn't 
show me the real cause.
It would seem that you are building with SharedLibFont explicitly set to NO, 
which is the default on a Debian system (see linux.cf).  The attached, which 
I've just committed, should fix this problem.

Thanks.
Marc.
+--+---+
|  Marc Aurele La France   |  work:   1-780-492-9310   |
|  Computing and Network Services  |  fax:1-780-492-1729   |
|  352 General Services Building   |  email:  [EMAIL PROTECTED]  |
|  University of Alberta   +---+
|  Edmonton, Alberta   |   |
|  T6G 2H1 | Standard disclaimers apply|
|  CANADA  |   |
+--+---+
XFree86 developer and VP.  ATI driver and X server internals.

Dickey.diff.gz
Description: Binary data


Re: build problems in programs/xfs

2005-01-22 Thread Marc Aurele La France
On Sat, 22 Jan 2005, Thomas Dickey wrote:
On Sat, 22 Jan 2005, Marc Aurele La France wrote:
It would seem that you are building with SharedLibFont explicitly set to 
NO, which is the default on a Debian system (see linux.cf).  The attached, 
which I've just committed, should fix this problem.

That works, but SharedLibFont has been NO for some time.
... in Debian, yes.
  Perhaps some
dependency changed, making the objects in those libraries conflict.
No.  xfs provide[ds] its own Xalloc  Friends.  What changed is that it now 
needs to do the same for the Xllalloc  Friends I've introduced to address 
allocation wraparounds in libXfont.

Marc.
+--+---+
|  Marc Aurele La France   |  work:   1-780-492-9310   |
|  Computing and Network Services  |  fax:1-780-492-1729   |
|  352 General Services Building   |  email:  [EMAIL PROTECTED]  |
|  University of Alberta   +---+
|  Edmonton, Alberta   |   |
|  T6G 2H1 | Standard disclaimers apply|
|  CANADA  |   |
+--+---+
XFree86 developer and VP.  ATI driver and X server internals.
___
Devel mailing list
Devel@XFree86.Org
http://XFree86.Org/mailman/listinfo/devel


Re: build problems in programs/xfs

2005-01-22 Thread Thomas Dickey
yOn Sat, 22 Jan 2005, Marc Aurele La France wrote:
On Sat, 22 Jan 2005, Thomas Dickey wrote:
On Sat, 22 Jan 2005, Marc Aurele La France wrote:
It would seem that you are building with SharedLibFont explicitly set to 
NO, which is the default on a Debian system (see linux.cf).  The attached, 
which I've just committed, should fix this problem.

That works, but SharedLibFont has been NO for some time.
... in Debian, yes.
  Perhaps some
dependency changed, making the objects in those libraries conflict.
No.  xfs provide[ds] its own Xalloc  Friends.  What changed is that it now 
needs to do the same for the Xllalloc  Friends I've introduced to address 
allocation wraparounds in libXfont.
It sounds as if it's incomplete for the static version of Xfont
--
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net
___
Devel mailing list
Devel@XFree86.Org
http://XFree86.Org/mailman/listinfo/devel


Re: build problems in programs/xfs

2005-01-22 Thread Marc Aurele La France
On Sat, 22 Jan 2005, Thomas Dickey wrote:
It would seem that you are building with SharedLibFont explicitly set to 
NO, which is the default on a Debian system (see linux.cf).  The 
attached, which I've just committed, should fix this problem.

That works, but SharedLibFont has been NO for some time.

... in Debian, yes.

  Perhaps some
dependency changed, making the objects in those libraries conflict.

No.  xfs provide[ds] its own Xalloc  Friends.  What changed is that it now 
needs to do the same for the Xllalloc  Friends I've introduced to address 
allocation wraparounds in libXfont.

It sounds as if it's incomplete for the static version of Xfont
libXfont does provide Xll*, in the same object that provides Xalloc.  Hence 
the multiple definitions you saw when xfs did not provide its own Xllalloc.

Marc.
+--+---+
|  Marc Aurele La France   |  work:   1-780-492-9310   |
|  Computing and Network Services  |  fax:1-780-492-1729   |
|  352 General Services Building   |  email:  [EMAIL PROTECTED]  |
|  University of Alberta   +---+
|  Edmonton, Alberta   |   |
|  T6G 2H1 | Standard disclaimers apply|
|  CANADA  |   |
+--+---+
XFree86 developer and VP.  ATI driver and X server internals.
___
Devel mailing list
Devel@XFree86.Org
http://XFree86.Org/mailman/listinfo/devel


build problems in programs/xfs

2005-01-21 Thread Thomas Dickey
No one seems to have run into this one, but it's been broken for (me at least)
for the past couple of weeks.  Ifdef'ing out the conflicting code gets it to
build; I'm not sure which change caused it:

make[5]: Leaving directory 
`/usr/build/xfree86/XFree86-cvs050121-build/xc/programs/xfs/difs'
gcc -m32 -o xfs -O2 -fno-strength-reduce -fno-strict-aliasing -ansi -Wall 
-Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
-Wmissing-declarations -Wredundant-decls -Wnested-externs 
-Wundef -L../../exports/libdifs/libdifs.a os/libos.a  
-L../../exports/lib   -lXfont -lfreetype -lm -lz  
-Wl,-rpath-link,../../exports/lib
../../exports/lib/libXfont.a(miscutil.o)(.data+0x0): multiple definition of 
`serverGeneration'
difs/libdifs.a(globals.o)(.bss+0x0): first defined here
../../exports/lib/libXfont.a(miscutil.o)(.text+0x0): In function `Xalloc':
: multiple definition of `Xalloc'
difs/libdifs.a(difsutils.o)(.text+0xb00): first defined here
../../exports/lib/libXfont.a(miscutil.o)(.text+0x10): In function `Xrealloc':
: multiple definition of `Xrealloc'
difs/libdifs.a(difsutils.o)(.text+0xb10): first defined here
/usr/bin/ld: Warning: size of symbol `Xrealloc' changed from 9 in 
difs/libdifs.a(difsutils.o) to 41 in difs/libdifs.a(difsutils.o)
../../exports/lib/libXfont.a(miscutil.o)(.text+0x40): In function `Xcalloc':
: multiple definition of `Xcalloc'
difs/libdifs.a(difsutils.o)(.text+0xb30): first defined here
/usr/bin/ld: Warning: size of symbol `Xcalloc' changed from 68 in 
difs/libdifs.a(difsutils.o) to 30 in difs/libdifs.a(difsutils.o)
../../exports/lib/libXfont.a(miscutil.o)(.text+0x60): In function `Xfree':
: multiple definition of `Xfree'
difs/libdifs.a(difsutils.o)(.text+0xb20): first defined here
/usr/bin/ld: Warning: size of symbol `Xfree' changed from 9 in 
difs/libdifs.a(difsutils.o) to 18 in difs/libdifs.a(difsutils.o)
../../exports/lib/libXfont.a(miscutil.o)(.text+0x150): In function 
`CopyISOLatin1Lowered':
: multiple definition of `CopyISOLatin1Lowered'
difs/libdifs.a(difsutils.o)(.text+0x250): first defined here
/usr/bin/ld: Warning: size of symbol `CopyISOLatin1Lowered' changed from 84 in 
difs/libdifs.a(difsutils.o) to 90 in difs/libdifs.a(difsutils.o)
collect2: ld returned 1 exit status
make[4]: *** [xfs] Error 1
make[4]: Leaving directory 
`/usr/build/xfree86/XFree86-cvs050121-build/xc/programs/xfs'
make[3]: *** [all] Error 2
make[3]: Leaving directory 
`/usr/build/xfree86/XFree86-cvs050121-build/xc/programs'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/usr/build/xfree86/XFree86-cvs050121-build/xc'
make[1]: *** [World] Error 2
make[1]: Leaving directory `/usr/build/xfree86/XFree86-cvs050121-build/xc'
make: *** [World] Error 2

--- ./programs/xfs/difs/difsutils.c.orig2001-12-14 15:01:33.0 
-0500
+++ ./programs/xfs/difs/difsutils.c 2005-01-21 18:34:41.0 -0500
@@ -190,6 +190,7 @@
 return FALSE;
 }
 
+#if 0
 void
 CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length)
 {
@@ -207,6 +208,7 @@
 }
 *dest = '\0';
 }
+#endif
 
 int
 strncmpnocase(
@@ -602,6 +604,7 @@
 return FALSE;
 }
 
+#if 0
 pointer
 Xalloc(unsigned long m)
 {
@@ -630,6 +633,7 @@
bzero(ret, n);
 return ret;
 }
+#endif
 
 int
 set_font_authorizations(char **authorizations, int *authlen, ClientPtr client)

--- ./programs/xfs/difs/globals.c.orig  2001-12-14 15:01:34.0 -0500
+++ ./programs/xfs/difs/globals.c   2005-01-21 18:35:26.0 -0500
@@ -59,7 +59,9 @@
 ClientPtr   serverClient;
 int currentMaxClients;
 char   *server;
+#if 0
 int serverGeneration = 0;
+#endif
 int argcGlobal;
 char  **argvGlobal;
 
-- 
Thomas E. Dickey [EMAIL PROTECTED]
http://invisible-island.net
ftp://invisible-island.net
___
Devel mailing list
Devel@XFree86.Org
http://XFree86.Org/mailman/listinfo/devel


Re: build problems in programs/xfs

2005-01-21 Thread Thomas Dickey
On Fri, 21 Jan 2005, Marc Aurele La France wrote:
On Fri, 21 Jan 2005, Thomas Dickey wrote:
No one seems to have run into this one, but it's been broken for (me at 
least)
for the past couple of weeks.  Ifdef'ing out the conflicting code gets it 
to
build; I'm not sure which change caused it:
Silly question, maybe, but is this from a fresh checkout?
Just to compare, I did a fresh checkout and it seems that the only changes
relative to my cvs update earlier today are files that have been touched
since then, e.g.,
 config/cf/X11.tmpl  |   17 ++-
 config/cf/linux.cf  |6 -
 config/cf/xfree86.cf|6 +
 lib/dmx/Imakefile   |3
 programs/Xserver/hw/dmx/Imakefile   |4
 programs/Xserver/hw/dmx/dmx_glxvisuals.c|7 +
 programs/Xserver/hw/dmx/glxProxy/g_renderswap.c |  114 +++-
 programs/Xserver/hw/dmx/glxProxy/glxcmds.c  |5 -
 programs/Xserver/hw/dmx/glxProxy/glxcmdsswap.c  |   11 ++
 programs/Xserver/hw/dmx/glxProxy/glxsingle.c|   11 ++
 programs/Xserver/hw/dmx/glxProxy/glxvendor.c|   10 +-
 programs/Xserver/hw/dmx/glxProxy/glxvisuals.c   |   11 +-
 programs/Xserver/hw/dmx/glxProxy/render2swap.c  |7 +
 programs/Xserver/hw/xfree86/CHANGELOG   |4
 14 files changed, 192 insertions(+), 24 deletions(-)
--
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net
___
Devel mailing list
Devel@XFree86.Org
http://XFree86.Org/mailman/listinfo/devel


Re: build problems in programs/xfs

2005-01-21 Thread Marc Aurele La France
On Fri, 21 Jan 2005, Thomas Dickey wrote:
On Fri, 21 Jan 2005, Marc Aurele La France wrote:
On Fri, 21 Jan 2005, Thomas Dickey wrote:
No one seems to have run into this one, but it's been broken for (me at 
least)
for the past couple of weeks.  Ifdef'ing out the conflicting code gets it 
to
build; I'm not sure which change caused it:

Silly question, maybe, but is this from a fresh checkout?

no - I did cvs updates from September (every couple of weeks).
The previous working build I have is from December 22.
Did you `make World`?
What sort of change would break an update?
Oh, there are plenty of possibilities, especially if you build in the checked 
out tree, a practice I don't recommend.

Marc.
+--+---+
|  Marc Aurele La France   |  work:   1-780-492-9310   |
|  Computing and Network Services  |  fax:1-780-492-1729   |
|  352 General Services Building   |  email:  [EMAIL PROTECTED]  |
|  University of Alberta   +---+
|  Edmonton, Alberta   |   |
|  T6G 2H1 | Standard disclaimers apply|
|  CANADA  |   |
+--+---+
XFree86 developer and VP.  ATI driver and X server internals.
___
Devel mailing list
Devel@XFree86.Org
http://XFree86.Org/mailman/listinfo/devel