openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1486833 - /openoffice/trunk/main/connectivity/source/drivers/mozab/makefile_mozab.mk
Date Tue, 28 May 2013 09:36:04 GMT
Author: hdu
Date: Tue May 28 09:36:03 2013
New Revision: 1486833

URL: http://svn.apache.org/r1486833
Log:
#i122396# prevent boost from using typeids in connectivity's no-rtti parts
    
fixes a build breaker in some environments where boost's tr1 is used as STL.
The dependence of rtti-less parts of the connectivity module on rtti-enabled
comphelper headers which in turn uses STL in both modes explores the limits
of compilers and runtime environments for little gain and is thus quite sick...

Modified:
    openoffice/trunk/main/connectivity/source/drivers/mozab/makefile_mozab.mk

Modified: openoffice/trunk/main/connectivity/source/drivers/mozab/makefile_mozab.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/mozab/makefile_mozab.mk?rev=1486833&r1=1486832&r2=1486833&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/mozab/makefile_mozab.mk (original)
+++ openoffice/trunk/main/connectivity/source/drivers/mozab/makefile_mozab.mk Tue May 28 09:36:03
2013
@@ -69,7 +69,7 @@ MOZINC = . \
   .IF "$(COM)" == "GCC"
     INCPOST += $(MOZINC)
     CFLAGSCXX += \
-                -fno-rtti \
+                -fno-rtti -DBOOST_NO_TYPEID \
                 -Wall \
                 -Wconversion \
                 -Wpointer-arith \
@@ -95,7 +95,7 @@ MOZINC = . \
     CFLAGS  += -fPIC -g
     CDEFS   += -DOJI
     CFLAGSCXX += \
-            -fno-rtti \
+            -fno-rtti -DBOOST_NO_TYPEID \
             -Wconversion \
             -Wpointer-arith \
             -Wcast-align \
@@ -107,7 +107,7 @@ MOZINC = . \
   .ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
     CFLAGS +=   -fPIC
     CFLAGSCXX += \
-            -fno-rtti \
+            -fno-rtti -DBOOST_NO_TYPEID \
             -Wconversion \
             -Wpointer-arith \
             -Wcast-align \



Mime
View raw message