The following are the updates I've had to make to ibm.cf and ibmLib.tmpl in order to get X11R6.8 to build on AIX. *** ibm.cf.orig Sun Aug 29 22:37:21 2004 --- ibm.cf Thu Aug 26 22:53:18 2004 *************** *** 36,42 **** * #define HasPosixThreads NO * in the BeforeVendorCF section of your site.def. */ ! #if !defined(HasPosixThreads) && ((OSMajorVersion == 3 && (OSMinorVersion > 2 || (OSMinorVersion == 2 && OSTeenyVersion > 4))) || (OSMajorVersion == 4 && (OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1)))) #define HasPosixThreads YES #endif #if HasPosixThreads --- 36,42 ---- * #define HasPosixThreads NO * in the BeforeVendorCF section of your site.def. */ ! #if !defined(HasPosixThreads) && ((OSMajorVersion == 3 && (OSMinorVersion > 2 || (OSMinorVersion == 2 && OSTeenyVersion > 4))) || (OSMajorVersion == 4 && (OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1))) || (OSMajorVersion >= 5)) #define HasPosixThreads YES #endif #if HasPosixThreads *************** *** 46,51 **** --- 46,71 ---- #endif #endif #endif /* OS > 3.2 */ + + #define NeedConstPrototypes YES + #define NeedFunctionPrototypes YES + #define NeedNestedPrototypes YES + #define NeedVarargsPrototypes YES + + #ifndef XVirtualFramebufferServer + #define XVirtualFramebufferServer YES + #endif + + #if !defined(TermcapLibrary) + #define TermcapLibrary -lcurses + #endif + + #if !defined(HasPam) && ((OSMajorVersion == 5) && (OSMinorVersion >= 2) || OSMajorVersion > 5) + #define HasPam YES + #ifndef PamLibraries + #define PamLibraries -lpam + #endif + #endif /* * For IBM platforms, we must define both the location of the compiler *** ibmLib.tmpl.orig Sun Aug 29 22:37:51 2004 --- ibmLib.tmpl Thu Aug 26 22:53:18 2004 *************** *** 1,5 **** XCOMM $Xorg: ibmLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ ! XCOMM $XdotOrg: xc/config/cf/ibmLib.tmpl,v 1.3 2004/08/16 16:36:13 krh Exp $ /* * AIX shared library template --- 1,5 ---- XCOMM $Xorg: ibmLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ ! XCOMM $XdotOrg: xc/config/cf/ibmLib.tmpl,v 1.2 2004/04/23 18:41:58 eich Exp $ /* * AIX shared library template *************** *** 35,42 **** #define SharedXmuuReqs $(XLIBONLY) #define SharedOldXReqs $(XLIBONLY) #define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs ! #define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(XLIB) $(XPMLIB) ! #define SharedXaw6Reqs $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXiReqs $(XLIB) #define SharedXtstReqs $(XLIB) #define SharedPexReqs $(XONLYLIB) --- 35,42 ---- #define SharedXmuuReqs $(XLIBONLY) #define SharedOldXReqs $(XLIBONLY) #define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs ! #define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XPMLIB) ! #define SharedXaw6Reqs $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB) #define SharedXiReqs $(XLIB) #define SharedXtstReqs $(XLIB) #define SharedPexReqs $(XONLYLIB) *************** *** 54,59 **** --- 54,63 ---- #define SharedFontencReqs $(BUILDLIBDIR)/libz.a #define SharedXfontcacheReqs $(XLIB) #define SharedXfontReqs stubs/libfntstubs.a $(FREETYPE2LIB) + #define SharedXfixesReqs $(XONLYLIB) + #define SharedXdamageReqs $(XONLYLIB) + #define SharedXcompositeReqs $(XONLYLIB) + #define SharedXevieReqs $(XONLYLIB) $(EXTENSIONLIB) #define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs #define SharedXmReqs $(LDPRELIBS) SharedXReqs
I've assigned this to myself.
Actually assigning this time.
BTW, the changes looks fine. The only one that I would question is making Xaw/Xaw6 require Xp. That issue is still undecided at this point.
I've checked in the changes now (excpet for the extra Xaw dependencies, which will need to be added to many config files and they will be added here as well pending the outcome of the issue). Closing.
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.