On Wed, Dec 10, 2003 at 11:53:02AM +1000, [EMAIL PROTECTED] wrote: >I have experienced a number of build problems on Solaris 2.5.1 x86. Most >of these I believe would be problems on any system that does not provide an >implementation of snprintf. Below are patches that enable 4.4.0 RC1 to >build on our system. Many of them are reversals of changes that were made >since 4.3.0. I don't know what the reasons for these changes were, so the >author(s) of these changes may want to review the patches to see if they >are appropriate or if some other changes are needed to fix this. The jmp >changes are ones that I also had to make for 4.3.0. I think the >replacement code I just got from the 4.2.0 or 4.2.1 versions, so quite >possibly will have some effect on other systems.
The jmp changes need to be conditional. The version you have will break most other systems. Is sigjmp_buf in none of the system headers? >In case it makes a difference, the changes between my host.def and the >supplied xfree86.def are also included here. Note also that I have >disabled BuildGlxExt since I could not build with this for 4.3.0. I know >of one other person who had the same problem with Solaris 8. I will retest >with "#define BuildGlxExt NO" commented out in the next day and >post the results to the list. I've done test builds on 2.6 -> 8, and didn't need to disable anything. >*** programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c.orig Fri >Nov 21 15:59:54 2003 >--- programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Tue >Dec 9 15:32:46 2003 >*************** >*** 1878,1883 **** >--- 1878,1887 ---- > > > >+ #ifdef NEED_SNPRINTF >+ #include "snprintf.c" >+ #endif >+ > #ifdef HAVE_SYSV_IPC > > int snprintf.c should get built in Xserver/os for platforms that need it. Is that not working for some reason? >*** programs/mkfontscale/mkfontscale.c.orig Wed Dec 3 15:01:31 2003 >--- programs/mkfontscale/mkfontscale.c Tue Dec 9 11:47:00 2003 >*************** >*** 45,50 **** >--- 45,56 ---- > #include "data.h" > #include "ident.h" > >+ #ifdef NEED_SNPRINTF >+ #undef SCOPE >+ #define SCOPE static >+ #include "snprintf.c" >+ #endif >+ > #define NPREFIX 1024 > > #ifndef MAXFONTFILENAMELEN That looks OK. >--- programs/xdm/Imakefile Tue Dec 9 12:37:45 2003 >*************** >*** 167,172 **** >--- 167,175 ---- > > #if HasSnprintf > SNPRINTF_DEFINES = -DHAS_SNPRINTF >+ #else >+ SNPRINTFSRCS = snprintf.c >+ SNPRINTFOBJS = snprintf.o > #endif Xdm is supposed to be using XmuSnprintf via this in dm.h: #ifndef HAS_SNPRINTF #include <X11/Xmu/SysUtil.h> #define snprintf XmuSnprintf #endif Can you tell us where this isn't working (maybe dm.h isn't included somewhere that needs this)? >*** programs/fonttosfnt/util.c.orig Fri Nov 21 16:00:45 2003 >--- programs/fonttosfnt/util.c Tue Dec 9 11:49:24 2003 >*************** >*** 38,43 **** >--- 38,50 ---- > #include FT_BDF_H > #include "fonttosfnt.h" > >+ #ifdef NEED_SNPRINTF >+ #undef SCOPE >+ #define SCOPE static >+ #include "snprintf.c" >+ #endif >+ >+ That looks OK. David -- David Dawes developer/release engineer The XFree86 Project www.XFree86.org/~dawes _______________________________________________ Devel mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/devel
