components/doxygen/patches/doxygen1.patch
changeset 3902 e9e957d48b8f
parent 1303 79b691ffbda3
child 5665 8f68cd0d0916
equal deleted inserted replaced
3901:417c8308b4af 3902:e9e957d48b8f
     1 --- doxygen-1.5.7.1/doc/Doxyfile	Sat Aug 16 10:07:19 2008
     1 Changes needed to get doxygen to configure and build with the GNU compilers
     2 +++ doxygen-1.5.7.1/doc/Doxyfile.new	Fri Apr  1 11:21:12 2011
     2 on Solaris.
     3 @@ -22,7 +22,7 @@
     3 
       
     4 The second part of these changes will be sent upstream.
       
     5 
       
     6 --- doxygen-1.8.9/doc/Doxyfile.orig	2015-03-02 18:48:16.796824973 -0800
       
     7 +++ doxygen-1.8.9/doc/Doxyfile	2015-03-02 18:47:58.404324590 -0800
       
     8 @@ -23,7 +23,7 @@
     4  EXTRACT_ALL       = NO
     9  EXTRACT_ALL       = NO
     5  EXTRACT_PRIVATE   = NO
    10  EXTRACT_PRIVATE   = NO
     6  GENERATE_MAN      = NO
    11  GENERATE_MAN      = NO
     7 -GENERATE_LATEX    = YES
    12 -GENERATE_LATEX    = YES
     8 +GENERATE_LATEX    = NO
    13 +GENERATE_LATEX    = NO
     9  GENERATE_HTML     = YES
    14  GENERATE_HTML     = YES
    10  GENERATE_HTMLHELP = YES
    15  GENERATE_HTMLHELP = NO
    11  GENERATE_RTF      = NO
    16  GENERATE_RTF      = NO
    12 --- doxygen-1.5.7.1/tmake/lib/solaris-cc/tmake.conf	Fri Jul 21 12:54:14 2006
    17 --- doxygen-1.8.9/tmake/lib/solaris-g++/tmake.conf.orig	2015-03-02 18:45:51.095061314 -0800
    13 +++ doxygen-1.5.7.1/tmake/lib/solaris-cc/tmake.conf.new	Fri Apr  1 11:22:45 2011
    18 +++ doxygen-1.8.9/tmake/lib/solaris-g++/tmake.conf	2015-03-02 19:55:43.793869862 -0800
    14 @@ -17,7 +17,7 @@
    19 @@ -8,7 +8,7 @@
    15  TMAKE_CFLAGS_YACC	=
    20  CONFIG			= qt warn_on release
    16  
    21  
    17  TMAKE_CXX		= CC
    22  TMAKE_CC		= gcc
    18 -TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
    23 -TMAKE_CFLAGS		=
    19 +TMAKE_CXXFLAGS		= -norunpath -D__USE_LEGACY_PROTOTYPES__
    24 +TMAKE_CFLAGS		= -m64
    20  TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
    25  TMAKE_CFLAGS_WARN_ON	= -Wall -W
    21  TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
    26  TMAKE_CFLAGS_WARN_OFF	=
    22  TMAKE_CXXFLAGS_RELEASE	= -O2
    27  TMAKE_CFLAGS_RELEASE	= -O2
    23 @@ -37,7 +37,7 @@
    28 @@ -36,14 +36,14 @@
    24  TMAKE_LINK		= CC
    29  
    25  # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
    30  TMAKE_LINK		= g++
    26  TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
    31  TMAKE_LINK_SHLIB	= g++
    27 -TMAKE_LFLAGS		=
    32 -TMAKE_LFLAGS		=
    28 +TMAKE_LFLAGS		= -norunpath
    33 +TMAKE_LFLAGS		= -m64
    29  TMAKE_LFLAGS_RELEASE	=
    34  TMAKE_LFLAGS_RELEASE	=
    30  TMAKE_LFLAGS_DEBUG	=
    35  TMAKE_LFLAGS_DEBUG	=
    31  TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)
    36  TMAKE_LFLAGS_SHAPP	= -shared
    32 --- doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf-orig	2013-03-26 19:19:25.644626673 -0500
    37  TMAKE_LFLAGS_SHLIB	= -shared -h $(TARGET1)
    33 +++ doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf	2013-03-26 19:22:10.411978779 -0500
    38  TMAKE_LFLAGS_SONAME	=
    34 @@ -17,7 +17,7 @@ TMAKE_CFLAGS_SHLIB	= -KPIC
       
    35  TMAKE_CFLAGS_YACC	=
       
    36  
    39  
    37  TMAKE_CXX		= CC
    40 -TMAKE_LIBS		= -liconv
    38 -TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
    41 +TMAKE_LIBS		=
    39 +TMAKE_CXXFLAGS		= -norunpath -D__USE_LEGACY_PROTOTYPES__ -m64
    42  TMAKE_LIBS_X11		= -lXext -lX11 -lm
    40  TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
    43  TMAKE_LIBS_QT		= -lqt
    41  TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
    44  TMAKE_LIBS_QT_MT	= -lqt-mt
    42  TMAKE_CXXFLAGS_RELEASE	= -xO2
       
    43 @@ -37,7 +37,7 @@ TMAKE_LIBDIR_OPENGL	=
       
    44  TMAKE_LINK		= CC
       
    45  # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
       
    46  TMAKE_LINK_SHLIB	= CC -R$(QTDIR)/lib:/usr/openwin/lib
       
    47 -TMAKE_LFLAGS		= -64 -xtarget=generic64
       
    48 +TMAKE_LFLAGS		= -norunpath -m64
       
    49  TMAKE_LFLAGS_RELEASE	=
       
    50  TMAKE_LFLAGS_DEBUG	=
       
    51  TMAKE_LFLAGS_SHLIB	= -G -h $(TARGET1)