USE_NBSD_THREADLIB and NetBSD 3.0 and ft2build.h

[Jeremy C. Reed]

Building release candidate 1 (xorg-x11-6.8.99.901.tar.bz2) on NetBSD 
3.0_BETA failed due to USE_NBSD_THREADLIB. On NetBSD 3.0, the threadlib.h 
include no longer exists.

I made no configurations, just did "make World".

Various errors of:

...
In file included from AuGetBest.c:36:
../../exports/include/X11/Xthreads.h:194:23: threadlib.h: No such file or 
directory

See
  http://cvsweb.netbsd.org/bsdweb.cgi/xsrc/xfree/xc/config/cf/NetBSD.cf

The following worked for me:

--- config/cf/NetBSD.cf.orig	2005-11-10 10:53:04.000000000 -0800
+++ config/cf/NetBSD.cf	2005-11-10 10:57:40.000000000 -0800
@@ -123,7 +123,11 @@
  # define ThreadedX		YES
  # define HasThreadSafeAPI	YES
  # define ThreadsLibraries	-lpthread
-# define LibraryMTDefines	-DUSE_NBSD_THREADLIB
+# if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
+      (OSMajorVersion == 2 && OSMinorVersion < 99) || \
+      (OSMajorVersion < 2))
+#  define LibraryMTDefines	-DUSE_NBSD_THREADLIB
+# endif
  # define SystemMTDefines	-D_REENTRANT
  # define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
  #else


Please consider committing the above.

I see the source has:
-rw-r--r--  1 reed  wheel  2002 Apr 23  2004 
./extras/freetype2/devel/ft2build.h
-rw-r--r--  1 reed  wheel  2185 Nov 14  2003 
./extras/freetype2/include/ft2build.h
-rw-r--r--  1 reed  wheel  2505 Jul  3 00:00 
./lib/font/FreeType/module/ft2build.h

Why these three files?

I had various errors like:

In file included from ../../extras/fontconfig/src/fcint.h:39,
                  from fcatomic.c:50:
                  ../../extras/fontconfig/fontconfig/fcfreetype.h:27:22: 
ft2build.h: No such file or directory

Again I made no configuration changes; I will look at this to see why it 
doesn't fall back to use the provided ft2build.h.

(I also have the /usr/pkg/include/ft2build.h too.)

I also had many errors like
../../../exports/bin/mkfontscale: not found

But I think that may be related to the ft2build.h error above.


  Jeremy C. Reed

  	  	 	 open source, Unix, *BSD, Linux training
 	  	 	 http://www.pugetsoundtechnology.com/