Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/doxygen/patches/doxygen1.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Thu, 05 Nov 2015 15:56:49 -0800
changeset 5068 04572323827e
parent 3902 e9e957d48b8f
child 5665 8f68cd0d0916
permissions -rw-r--r--
Close of build 87.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3902
e9e957d48b8f 20633750 Adjust Userland doxygen build to use the GNU compilers
Rich Burridge <rich.burridge@oracle.com>
parents: 1303
diff changeset 
     1
 
Changes needed to get doxygen to configure and build with the GNU compilers
e9e957d48b8f 20633750 Adjust Userland doxygen build to use the GNU compilers
Rich Burridge <rich.burridge@oracle.com>
parents: 1303
diff changeset 
     2
 
on Solaris.
e9e957d48b8f 20633750 Adjust Userland doxygen build to use the GNU compilers
Rich Burridge <rich.burridge@oracle.com>
parents: 1303
diff changeset 
     3
 












e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




     4


The second part of these changes will be sent upstream.













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




     5














e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




     6


--- doxygen-1.8.9/doc/Doxyfile.orig	2015-03-02 18:48:16.796824973 -0800













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




     7


+++ doxygen-1.8.9/doc/Doxyfile	2015-03-02 18:47:58.404324590 -0800













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




     8


@@ -23,7 +23,7 @@








195






62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




     9


 EXTRACT_ALL       = NO













62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    10


 EXTRACT_PRIVATE   = NO













62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    11


 GENERATE_MAN      = NO













62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    12


-GENERATE_LATEX    = YES













62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    13


+GENERATE_LATEX    = NO













62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    14


 GENERATE_HTML     = YES








3902






e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    15


 GENERATE_HTMLHELP = NO








195






62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    16


 GENERATE_RTF      = NO








3902






e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    17


--- doxygen-1.8.9/tmake/lib/solaris-g++/tmake.conf.orig	2015-03-02 18:45:51.095061314 -0800













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    18


+++ doxygen-1.8.9/tmake/lib/solaris-g++/tmake.conf	2015-03-02 19:55:43.793869862 -0800













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    19


@@ -8,7 +8,7 @@













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    20


 CONFIG			= qt warn_on release








195






62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    21


 








3902






e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    22


 TMAKE_CC		= gcc













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    23


-TMAKE_CFLAGS		=













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    24


+TMAKE_CFLAGS		= -m64













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    25


 TMAKE_CFLAGS_WARN_ON	= -Wall -W













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    26


 TMAKE_CFLAGS_WARN_OFF	=













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    27


 TMAKE_CFLAGS_RELEASE	= -O2













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    28


@@ -36,14 +36,14 @@













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    29


 













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    30


 TMAKE_LINK		= g++













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    31


 TMAKE_LINK_SHLIB	= g++








195






62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    32


-TMAKE_LFLAGS		=








3902






e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    33


+TMAKE_LFLAGS		= -m64








195






62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    34


 TMAKE_LFLAGS_RELEASE	=













62e9499728a6
7036315 migrate doxygen to userland



Kevin Crowe <Kevin.Crowe@oracle.com>


parents: 

diff
changeset




    35


 TMAKE_LFLAGS_DEBUG	=








3902






e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    36


 TMAKE_LFLAGS_SHAPP	= -shared













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    37


 TMAKE_LFLAGS_SHLIB	= -shared -h $(TARGET1)













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    38


 TMAKE_LFLAGS_SONAME	=








1303






79b691ffbda3
16734056 Make antlr ASLR enabled



Brian Cameron <brian.cameron@oracle.com>


parents: 
372

diff
changeset




    39


 








3902






e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    40


-TMAKE_LIBS		= -liconv













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    41


+TMAKE_LIBS		=













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    42


 TMAKE_LIBS_X11		= -lXext -lX11 -lm













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    43


 TMAKE_LIBS_QT		= -lqt













e9e957d48b8f
20633750 Adjust Userland doxygen build to use the GNU compilers



Rich Burridge <rich.burridge@oracle.com>


parents: 
1303

diff
changeset




    44


 TMAKE_LIBS_QT_MT	= -lqt-mt















upstream/oracle/userland-gate