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 Brian Cameron <brian.cameron@oracle.com>
Wed, 15 May 2013 12:38:01 -0700
changeset 1303 79b691ffbda3
parent 372 572543a47583
child 3902 e9e957d48b8f
permissions -rw-r--r--
16734056 Make antlr ASLR enabled 16734059 Doxygen needs to be 64-bit and have ASLR enabled 16734063 librsync needs ASLR enabled 16734067 Need to make libsndfile ASLR enabled. 16734069 MC needs to be made 64-bit 16734074 spawn-fcgi needs to be made 64-bit and be ASLR enabled 16734080 Make Python 2.6, Python 2.7, cssutils, PIL, simplejson & twiste d ASLR enabled.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
195
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     1
 
--- doxygen-1.5.7.1/doc/Doxyfile	Sat Aug 16 10:07:19 2008
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     2
 
+++ doxygen-1.5.7.1/doc/Doxyfile.new	Fri Apr  1 11:21:12 2011
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     3
 
@@ -22,7 +22,7 @@
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     4
 
 EXTRACT_ALL       = NO
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     5
 
 EXTRACT_PRIVATE   = NO
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     6
 
 GENERATE_MAN      = NO
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     7
 
-GENERATE_LATEX    = YES
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     8
 
+GENERATE_LATEX    = NO
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     9
 
 GENERATE_HTML     = YES
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    10
 
 GENERATE_HTMLHELP = YES
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    11
 
 GENERATE_RTF      = NO
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    12
 
--- doxygen-1.5.7.1/tmake/lib/solaris-cc/tmake.conf	Fri Jul 21 12:54:14 2006
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    13
 
+++ doxygen-1.5.7.1/tmake/lib/solaris-cc/tmake.conf.new	Fri Apr  1 11:22:45 2011
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    14
 
@@ -17,7 +17,7 @@
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    15
 
 TMAKE_CFLAGS_YACC	=
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    16
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    17
 
 TMAKE_CXX		= CC
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    18
 
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
372
572543a47583 7050577 userland fails to build on 166
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 195
diff changeset 
    19
 
+TMAKE_CXXFLAGS		= -norunpath -D__USE_LEGACY_PROTOTYPES__
195
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    20
 
 TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    21
 
 TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    22
 
 TMAKE_CXXFLAGS_RELEASE	= -O2
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    23
 
@@ -37,7 +37,7 @@
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    24
 
 TMAKE_LINK		= CC
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    25
 
 # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    26
 
 TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    27
 
-TMAKE_LFLAGS		=
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    28
 
+TMAKE_LFLAGS		= -norunpath
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    29
 
 TMAKE_LFLAGS_RELEASE	=
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    30
 
 TMAKE_LFLAGS_DEBUG	=
62e9499728a6 7036315 migrate doxygen to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    31
 
 TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
1303
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    32
 
--- doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf-orig	2013-03-26 19:19:25.644626673 -0500
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    33
 
+++ doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf	2013-03-26 19:22:10.411978779 -0500
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    34
 
@@ -17,7 +17,7 @@ TMAKE_CFLAGS_SHLIB	= -KPIC
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    35
 
 TMAKE_CFLAGS_YACC	=
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    36
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    37
 
 TMAKE_CXX		= CC
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    38
 
-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    39
 
+TMAKE_CXXFLAGS		= -norunpath -D__USE_LEGACY_PROTOTYPES__ -m64
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    40
 
 TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    41
 
 TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    42
 
 TMAKE_CXXFLAGS_RELEASE	= -xO2
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    43
 
@@ -37,7 +37,7 @@ TMAKE_LIBDIR_OPENGL	=
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    44
 
 TMAKE_LINK		= CC
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    45
 
 # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    46
 
 TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    47
 
-TMAKE_LFLAGS		= -64 -xtarget=generic64
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    48
 
+TMAKE_LFLAGS		= -norunpath -m64
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    49
 
 TMAKE_LFLAGS_RELEASE	=
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    50
 
 TMAKE_LFLAGS_DEBUG	=
79b691ffbda3 16734056 Make antlr ASLR enabled
Brian Cameron <brian.cameron@oracle.com>
parents: 372
diff changeset 
    51
 
 TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
upstream/oracle/userland-gate