Index: sun.cf =================================================================== RCS file: /cvs/xorg/xc/config/cf/sun.cf,v retrieving revision 1.11 diff -u -r1.11 sun.cf --- sun.cf 23 Apr 2005 20:23:44 -0000 1.11 +++ sun.cf 8 May 2005 21:02:34 -0000 @@ -176,6 +176,11 @@ # define CplusplusCompilerMinorVersion 0 # endif # endif +# ifndef CplusplusLibC +# if CplusplusCompilerMajorVersion >= 5 +# define CplusplusLibC -lCrun +# endif +# endif XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion #endif Index: sunLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/sunLib.tmpl,v retrieving revision 1.6 diff -u -r1.6 sunLib.tmpl --- sunLib.tmpl 2 Sep 2004 01:10:28 -0000 1.6 +++ sunLib.tmpl 8 May 2005 21:02:34 -0000 @@ -1,5 +1,5 @@ XCOMM $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XdotOrg: xc/config/cf/sunLib.tmpl,v 1.5 2004/08/16 16:36:13 krh Exp $ +XCOMM $XdotOrg: xc/config/cf/sunLib.tmpl,v 1.6 2004/09/02 01:10:28 kem Exp $ @@ -88,6 +88,7 @@ # define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIBONLY) -lc # define SharedPSResReqs -lc # define SharedGLReqs $(LDPRELIB) $(XLIB) -lc +# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB) MathLibrary -lc # define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) MathLibrary -lc # define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -lc # define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) MathLibrary -lc Index: sv4Lib.rules =================================================================== RCS file: /cvs/xorg/xc/config/cf/sv4Lib.rules,v retrieving revision 1.4 diff -u -r1.4 sv4Lib.rules --- sv4Lib.rules 8 Nov 2004 00:08:21 -0000 1.4 +++ sv4Lib.rules 8 May 2005 21:02:34 -0000 @@ -162,7 +162,11 @@ (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ + @if $(SOSYMLINK); then (set -x; \ @@\ + $(RM) Concat(lib,libname.so); \ @@\ + $(LN) $@ Concat(lib,libname.so)); fi @@\ LinkBuildLibrary($@) @@\ + LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ @@\ clean:: @@\ $(RM) Concat(lib,libname.so.rev)