[Libreoffice-commits] core.git: cppunit/ExternalProject_cppunit.mk liborcus/ExternalProject_liborcus.mk solenv/gbuild

[Stephan Bergmann]

 cppunit/ExternalProject_cppunit.mk   |    8 +-------
 liborcus/ExternalProject_liborcus.mk |    8 +-------
 solenv/gbuild/platform/macosx.mk     |   12 ------------
 3 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit dfebe3fc512939395e8ece9cab85eb1c2cb04783
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Apr 18 08:38:06 2013 +0200

    Revert _GLIBCXX_DEBUG on Mac OS X again
    
    It does not work, see
    <http://lists.freedesktop.org/archives/libreoffice/2013-April/050321.html> "Re:
    [ANN] --enable-dbgutil: everyone gets a Debug STL!"
    
    Change-Id: I0b0c0faa03a1a03095b70454d38a1a193b42d56a

diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk
index 7aba4f0..bb63996 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -38,18 +38,12 @@ else
 
 cppunit_CXXFLAGS=$(CXXFLAGS)
 
-ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX MACOSX NETBSD OPENBSD,$(OS)))
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
 ifneq (,$(gb_ENABLE_DBGUTIL))
 cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-ifeq ($(OS),MACOSX)
-ifneq (,$(gb_ENABLE_DBGUTIL))
-cppunit_CXXFLAGS+=-D_GLIBCXX_FULLY_DYNAMIC_STRING
-endif
-endif
-
 ifeq ($(OS)-$(COM),WNT-GCC)
 cppunit_CXXFLAGS+=-mthreads
 endif
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index ce9644c..75099fa 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -57,18 +57,12 @@ endif
 # library (glibc), the NDK does offer the GNU C++ library as one of
 # the C++ libraries available, and we use it.
 #
-ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX MACOSX NETBSD OPENBSD,$(OS)))
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
 ifneq (,$(gb_ENABLE_DBGUTIL))
 liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-ifeq ($(OS),MACOSX)
-ifneq (,$(gb_ENABLE_DBGUTIL))
-liborcus_CPPFLAGS+=-D_GLIBCXX_FULLY_DYNAMIC_STRING
-endif
-endif
-
 liborcus_CXXFLAGS=$(CXXFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index efb0f05..011aaae 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -77,18 +77,6 @@ gb_COMPILERDEFS += \
 
 endif
 
-# Enable debug libstdc++
-ifeq ($(gb_ENABLE_DBGUTIL),$(true))
-gb_COMPILERDEFS += \
-	-D_GLIBCXX_DEBUG \
-
-# See http://lists.apple.com/archives/cocoa-dev/2009/Sep/msg01199.html ,
-# http://stackoverflow.com/questions/2234557/c-using-getline-prints-pointer-being-freed-was-not-allocated-in-xcode
-gb_COMPILERDEFS += \
-	-D_GLIBCXX_FULLY_DYNAMIC_STRING \
-
-endif
-
 ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
 gb_CXXFLAGS += -Wno-long-double
 endif