Re: pkg/30894

[NAKAJI Hiroyuki <nakaji%jp.freebsd.org@localhost>]

The following reply was made to PR pkg/30894; it has been noted by GNATS.

From: NAKAJI Hiroyuki <nakaji%jp.freebsd.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: dauphin%enst.fr@localhost
Subject: Re: pkg/30894
Date: Sun, 04 Dec 2005 23:16:11 +0900

 I'm not sure this is only Solaris specific or not, but, the same
 "cannot compile on solaris" problem is reported to dreedesktop.org.
 https://bugs.freedesktop.org/show_bug.cgi?id=3485
 
 I experienced the same compile error with cc (Sun Studio 11), and made
 two patches: patches/patch-a[kl]. They can fix my "cannot compile"
 problem.
 
 patch-ak is for cc and patch-al is for gcc. Thanks.
 
 ==== patches/patch-ak ====
 --- configs/solaris-x86.orig   Tue Sep 14 06:00:36 2004
 +++ configs/solaris-x86        Sun Dec  4 22:36:31 2005
 @@ -7,12 +7,12 @@
  # Compiler and flags
  CC = cc
  CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM
 -MKLIB_OPTIONS = -static
 +#MKLIB_OPTIONS = -static
  
  APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 
-lXext -lXmu -lXi -lm
  
 -GL_LIB_NAME = libGL.a
 -GLU_LIB_NAME = libGLU.a
 -GLUT_LIB_NAME = libglut.a
 -GLW_LIB_NAME = libGLw.a
 -OSMESA_LIB_NAME = libOSMesa.a
 +#GL_LIB_NAME = libGL.a
 +#GLU_LIB_NAME = libGLU.a
 +#GLUT_LIB_NAME = libglut.a
 +#GLW_LIB_NAME = libGLw.a
 +#OSMESA_LIB_NAME = libOSMesa.a
 
 ==== patches/patch-al ====
 --- configs/solaris-x86-gcc.orig       Tue Sep 14 06:00:36 2004
 +++ configs/solaris-x86-gcc    Sun Dec  4 22:36:31 2005
 @@ -10,7 +10,7 @@
  CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM
  CXXFLAGS = -O3 -m486 -fPIC
  GLUT_CFLAGS = -fexceptions
 -MKLIB_OPTIONS = -static
 +#MKLIB_OPTIONS = -static
  
  GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
  GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 @@ -17,8 +17,8 @@
  GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib 
-lX11 -lXmu -lXt -lXi -lm
  APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib 
-l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
  
 -GL_LIB_NAME = libGL.a
 -GLU_LIB_NAME = libGLU.a
 -GLUT_LIB_NAME = libglut.a
 -GLW_LIB_NAME = libGLw.a
 -OSMESA_LIB_NAME = libOSMesa.a
 +#GL_LIB_NAME = libGL.a
 +#GLU_LIB_NAME = libGLU.a
 +#GLUT_LIB_NAME = libglut.a
 +#GLW_LIB_NAME = libGLw.a
 +#OSMESA_LIB_NAME = libOSMesa.a
 
 And, here is "cvs diff -u distinfo" output.
 
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/graphics/MesaLib/distinfo,v
 retrieving revision 1.32
 diff -u -r1.32 distinfo
 --- distinfo    8 Nov 2005 16:41:30 -0000       1.32
 +++ distinfo    4 Dec 2005 14:10:31 -0000
 @@ -16,3 +16,5 @@
  SHA1 (patch-ah) = 0c0a4d18531d2bc9ea1be83e89f373be5609f0e7
  SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558
  SHA1 (patch-aj) = 8282697af31605d07176943d7cf7e8f413e212de
 +SHA1 (patch-ak) = 14cb6c5629b83ed65e7958c6b1c57e2008e4efba
 +SHA1 (patch-al) = 8aa496efe2a1720478ffa5d1bdb780f4070febca
 --
 NAKAJI Hiroyuki