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/lib difs/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.orig 2001-12-14 15:01:33.000000000
-0500
+++ ./programs/xfs/difs/difsutils.c 2005-01-21 18:34:41.000000000 -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.000000000 -0500
+++ ./programs/xfs/difs/globals.c 2005-01-21 18:35:26.000000000 -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
