diff options
author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-05-15 20:52:39 +0000 |
---|---|---|
committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-05-15 20:52:39 +0000 |
commit | 2d4b7e67149ef010b519b5dee50b9392e53fd6d6 (patch) | |
tree | 311235348601af868f1812571d44e9504190dc02 /sunLib.tmpl | |
parent | ef8c226b93cb9facaf23d67eb4744c306778cf30 (diff) |
Add settings to bring Solaris builds closer to the ones Sun packages in
Solaris. Adds "BuildLikeSun" options for areas Sun deviates from the
way Xorg is packaged on other platforms. See comment in sun.cf for
details. Also, use system-provided Expat on Solaris 10 and other
cleanups.
Set shared library versions for Solaris builds to match versions used in
Solaris. Add missing SharedXfixesReqs and SharedXdamageReqs.
Add -solarisabi option to create XtStrings code compatibile with existing
Solaris binaries. (Off by default, on if "BuildLikeSun" is set in
sun.cf)
Diffstat (limited to 'sunLib.tmpl')
-rw-r--r-- | sunLib.tmpl | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/sunLib.tmpl b/sunLib.tmpl index d638ce7..7c30ff3 100644 --- a/sunLib.tmpl +++ b/sunLib.tmpl @@ -48,6 +48,98 @@ XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $ #else /* else it's Solaris */ +/* Solaris uses single digit library versions, and versions of libraries + * defined in SVID specs should match the versions specified there. + */ + +#ifndef SharedX11Rev +# define SharedX11Rev 4 +#endif +#ifndef SharedOldXRev +# define SharedOldXRev 6 +#endif +#ifndef SharedXextRev +# define SharedXextRev 0 +#endif +#ifndef SharedXauRev +# define SharedXauRev 6 +#endif +#ifndef SharedXdmcpRev +# define SharedXdmcpRev 6 +#endif +#ifndef SharedXmuRev +# define SharedXmuRev 4 +#endif +#ifndef SharedXpRev +# define SharedXpRev 1 +#endif +#ifndef SharedXpmRev +# define SharedXpmRev 4 +#endif +#ifndef SharedXtRev +# define SharedXtRev 4 +#endif +#ifndef SharedXaw6Rev +# define SharedXaw6Rev 5 +#endif +#ifndef SharedXiRev +# define SharedXiRev 5 +#endif +#ifndef SharedXtstRev +# define SharedXtstRev 1 +#endif +#ifndef SharedFSRev +# define SharedFSRev 5 +#endif +#ifndef SharedICERev +# define SharedICERev 6 +#endif +#ifndef SharedSMRev +# define SharedSMRev 6 +#endif +#ifndef SharedDamageRev +# define SharedDamageRev 1 +#endif +#ifndef SharedXfixesRev +# define SharedXfixesRev 1 +#endif +#ifndef SharedXftRev +# define SharedXftRev 2 +#endif +#ifndef SharedXrenderRev +# define SharedXrenderRev 1 +#endif +#ifndef SharedXResRev +# define SharedXResRev 1 +#endif +#ifndef SharedXvRev +# define SharedXvRev 1 +#endif +#ifndef SharedXvMCRev +# define SharedXvMCRev 1 +#endif +#ifndef SharedXrandrRev +# define SharedXrandrRev 2 +#endif +#ifndef SharedGlxRev +# define SharedGlxRev 1 +#endif +#ifndef SharedGluRev +# define SharedGluRev 1 +#endif +#ifndef SharedOSMesaRev +# define SharedOSMesaRev 4 +#endif +#ifndef SharedxkbfileRev +# define SharedxkbfileRev 5 +#endif +#ifndef SharedXxf86miscRev +# define SharedXxf86miscRev 1 +#endif +#ifndef SharedXxf86vmRev +# define SharedXxf86vmRev 1 +#endif + # if ThreadedX # if OSMinorVersion > 3 # define SharedThreadReqs /**/ @@ -92,6 +184,8 @@ XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $ # define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) MathLibrary -lc # define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -lc # define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) MathLibrary -lc +# define SharedXfixesReqs $(LDPRELIB) $(XLIB) -lc +# define SharedXdamageReqs $(LDPRELIB) $(XLIB) -lc # define SharedXauReqs -lc # define SharedXdmcpReqs -lsocket -lc |