From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001 From: Andrzej Szeszo <aszeszo@gmail.com> Date: Tue, 04 Jun 2013 12:32:37 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster --- components/doxygen/patches/doxygen1.patch | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/components/doxygen/patches/doxygen1.patch b/components/doxygen/patches/doxygen1.patch index 5b9c226..76e2bd8 100644 --- a/components/doxygen/patches/doxygen1.patch +++ b/components/doxygen/patches/doxygen1.patch @@ -29,3 +29,23 @@ 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 +@@ -17,7 +17,7 @@ TMAKE_CFLAGS_SHLIB = -KPIC + TMAKE_CFLAGS_YACC = + + 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 +@@ -37,7 +37,7 @@ TMAKE_LIBDIR_OPENGL = + TMAKE_LINK = CC + # Jan Wortelboer <janw@wins.uva.nl> 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) -- Gitblit v1.9.3