20633750 Adjust Userland doxygen build to use the GNU compilers
authorRich Burridge <rich.burridge@oracle.com>
Wed, 04 Mar 2015 07:09:31 -0800
changeset 3902 e9e957d48b8f
parent 3901 417c8308b4af
child 3903 bddba77320a5
20633750 Adjust Userland doxygen build to use the GNU compilers
components/doxygen/Makefile
components/doxygen/patches/doxygen1.patch
--- a/components/doxygen/Makefile	Tue Feb 24 17:31:31 2015 +0100
+++ b/components/doxygen/Makefile	Wed Mar 04 07:09:31 2015 -0800
@@ -44,10 +44,10 @@
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-# Necessary to find CC during build
-PATH=$(SPRO_VROOT)/bin:/usr/bin
+COMPILER =		gcc
+
 ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+PATH=$(PARFAIT_TOOLS):$(GCC_ROOT)/bin:/usr/bin
 endif
 
 
@@ -56,7 +56,7 @@
 
 # Need to override default options since configure doesn't
 # understand CC, CXX, etc.
-CONFIGURE_OPTIONS =	--platform solaris-cc-64
+CONFIGURE_OPTIONS =	--platform solaris-g++
 CONFIGURE_OPTIONS +=	--prefix /usr
 CONFIGURE_OPTIONS +=	--enable-langs am,ar,br,ca,cn,cz,de,dk,en,eo,es,fa,fi,fr,gr,hr,hu,id,it,je,jp,ke,kr,lt,lv,mk,nl,no,pl,pt,ro,ru,sc,si,sk,sr,sv,tr,tw,ua,vi,za
 
@@ -92,5 +92,6 @@
 REQUIRED_PACKAGES += developer/lexer/flex
 REQUIRED_PACKAGES += developer/parser/bison
 REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
 REQUIRED_PACKAGES += system/library/math
--- a/components/doxygen/patches/doxygen1.patch	Tue Feb 24 17:31:31 2015 +0100
+++ b/components/doxygen/patches/doxygen1.patch	Wed Mar 04 07:09:31 2015 -0800
@@ -1,51 +1,44 @@
---- doxygen-1.5.7.1/doc/Doxyfile	Sat Aug 16 10:07:19 2008
-+++ doxygen-1.5.7.1/doc/Doxyfile.new	Fri Apr  1 11:21:12 2011
[email protected]@ -22,7 +22,7 @@
+Changes needed to get doxygen to configure and build with the GNU compilers
+on Solaris.
+
+The second part of these changes will be sent upstream.
+
+--- doxygen-1.8.9/doc/Doxyfile.orig	2015-03-02 18:48:16.796824973 -0800
++++ doxygen-1.8.9/doc/Doxyfile	2015-03-02 18:47:58.404324590 -0800
[email protected]@ -23,7 +23,7 @@
  EXTRACT_ALL       = NO
  EXTRACT_PRIVATE   = NO
  GENERATE_MAN      = NO
 -GENERATE_LATEX    = YES
 +GENERATE_LATEX    = NO
  GENERATE_HTML     = YES
- GENERATE_HTMLHELP = YES
+ GENERATE_HTMLHELP = NO
  GENERATE_RTF      = NO
---- doxygen-1.5.7.1/tmake/lib/solaris-cc/tmake.conf	Fri Jul 21 12:54:14 2006
-+++ doxygen-1.5.7.1/tmake/lib/solaris-cc/tmake.conf.new	Fri Apr  1 11:22:45 2011
[email protected]@ -17,7 +17,7 @@
- TMAKE_CFLAGS_YACC	=
+--- doxygen-1.8.9/tmake/lib/solaris-g++/tmake.conf.orig	2015-03-02 18:45:51.095061314 -0800
++++ doxygen-1.8.9/tmake/lib/solaris-g++/tmake.conf	2015-03-02 19:55:43.793869862 -0800
[email protected]@ -8,7 +8,7 @@
+ CONFIG			= qt warn_on release
  
- TMAKE_CXX		= CC
--TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-+TMAKE_CXXFLAGS		= -norunpath -D__USE_LEGACY_PROTOTYPES__
- TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
- TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
- TMAKE_CXXFLAGS_RELEASE	= -O2
[email protected]@ -37,7 +37,7 @@
- TMAKE_LINK		= CC
- # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
- TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
+ TMAKE_CC		= gcc
+-TMAKE_CFLAGS		=
++TMAKE_CFLAGS		= -m64
+ TMAKE_CFLAGS_WARN_ON	= -Wall -W
+ TMAKE_CFLAGS_WARN_OFF	=
+ TMAKE_CFLAGS_RELEASE	= -O2
[email protected]@ -36,14 +36,14 @@
+ 
+ TMAKE_LINK		= g++
+ TMAKE_LINK_SHLIB	= g++
 -TMAKE_LFLAGS		=
-+TMAKE_LFLAGS		= -norunpath
++TMAKE_LFLAGS		= -m64
  TMAKE_LFLAGS_RELEASE	=
  TMAKE_LFLAGS_DEBUG	=
- TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
---- doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf-orig	2013-03-26 19:19:25.644626673 -0500
-+++ doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf	2013-03-26 19:22:10.411978779 -0500
[email protected]@ -17,7 +17,7 @@ TMAKE_CFLAGS_SHLIB	= -KPIC
- TMAKE_CFLAGS_YACC	=
+ TMAKE_LFLAGS_SHAPP	= -shared
+ TMAKE_LFLAGS_SHLIB	= -shared -h $(TARGET1)
+ TMAKE_LFLAGS_SONAME	=
  
- TMAKE_CXX		= CC
--TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-+TMAKE_CXXFLAGS		= -norunpath -D__USE_LEGACY_PROTOTYPES__ -m64
- TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
- TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
- TMAKE_CXXFLAGS_RELEASE	= -xO2
[email protected]@ -37,7 +37,7 @@ TMAKE_LIBDIR_OPENGL	=
- TMAKE_LINK		= CC
- # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
- TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
--TMAKE_LFLAGS		= -64 -xtarget=generic64
-+TMAKE_LFLAGS		= -norunpath -m64
- TMAKE_LFLAGS_RELEASE	=
- TMAKE_LFLAGS_DEBUG	=
- TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
+-TMAKE_LIBS		= -liconv
++TMAKE_LIBS		=
+ TMAKE_LIBS_X11		= -lXext -lX11 -lm
+ TMAKE_LIBS_QT		= -lqt
+ TMAKE_LIBS_QT_MT	= -lqt-mt