[Libreoffice-commits] .: 2 commits - configure.in liborcus/ExternalProject_liborcus.mk liborcus/liborcus_0.1.0-warnings.patch liborcus/UnpackedTarball_orcus.mk solenv/gbuild solenv/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 20 00:41:22 PDT 2012
configure.in | 12 ++++----
liborcus/ExternalProject_liborcus.mk | 2 -
liborcus/UnpackedTarball_orcus.mk | 2 -
liborcus/liborcus_0.1.0-warnings.patch | 45 ---------------------------------
solenv/gbuild/platform/macosx.mk | 2 -
solenv/inc/unxmacx.mk | 2 -
6 files changed, 9 insertions(+), 56 deletions(-)
New commits:
commit 288d4bf31399f474aadcd16b9a800aade0741aa2
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Sep 20 10:37:10 2012 +0300
Move -isysroot from gb_CFLAGS/gb_CXXFLAGS to CC/CXX
That is a much better place for it. The gb_C(XX)FLAGS don't get passed
on to "external" modules, so they should not contain flags that are
essential for the compilation to work at all. I think.
At least for me, in my MacOSX SDK 10.4 -based build tree, using Xcode
3 installed in /Xcode3, on OS X 10.8, the -isysroot is essential for
liborcus to compile.
Change-Id: I1f11c690585e4ba512eb87d2fddf11872b91dd57
diff --git a/configure.in b/configure.in
index c719859..1010672 100644
--- a/configure.in
+++ b/configure.in
@@ -2740,19 +2740,19 @@ if test "$_os" = "Darwin"; then
AC_MSG_ERROR([Cannot guess gcc location for this SDK])
;;
esac
- CC="${gccprefix}gcc-4.0 -mmacosx-version-min=$with_macosx_version_min_required"
- CXX="${gccprefix}g++-4.0 -mmacosx-version-min=$with_macosx_version_min_required"
+ CC="${gccprefix}gcc-4.0 -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+ CXX="${gccprefix}g++-4.0 -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
;;
10.6)
# Is similar logic as above needed? Is it likely somebody
# has both an older Xcode with the 10.6 SDK and a current
# Xcode?
- CC="gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required"
- CXX="g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required"
+ CC="gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+ CXX="g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
;;
10.7|10.8)
- CC="`xcrun -find clang` $bitness -mmacosx-version-min=$with_macosx_version_min_required"
- CXX="`xcrun -find clang++` $bitness -mmacosx-version-min=$with_macosx_version_min_required"
+ CC="`xcrun -find clang` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+ CXX="`xcrun -find clang++` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
;;
esac
AC_MSG_RESULT([$CC and $CXX])
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3d6810b..e81f0f5 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -49,7 +49,6 @@ gb_OSDEFS := \
gb_CFLAGS := \
- -isysroot $(gb_SDKDIR) \
$(gb_CFLAGS_COMMON) \
-fPIC \
-fno-strict-aliasing \
@@ -59,7 +58,6 @@ gb_CFLAGS := \
# "Re: [dev] warnings01: -Wnon-virtual-dtor" message to dev at openoffice.org from
# Feb 1, 2006:
gb_CXXFLAGS := \
- -isysroot $(gb_SDKDIR) \
$(gb_CXXFLAGS_COMMON) \
-fPIC \
-Wno-ctor-dtor-privacy \
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index a5ea287..0a58f4c 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -49,7 +49,7 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI
#.EXPORT: MACOSX_DEPLOYMENT_TARGET
CDEFS+:=-DQUARTZ
-EXTRA_CDEFS+:=-isysroot $(MACOSX_SDK_PATH) -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)
+EXTRA_CDEFS+:=-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)
# Name of library where static data members are initialized
# STATICLIBNAME=static$(DLLPOSTFIX)
commit 90fc5593a44f41489719bc882db21813416f80da
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Sep 20 10:25:01 2012 +0300
Revert "Pass also gb_CXXFLAGS to the liborcus configury"
Causes way too much problems with the tinderboxes, thanks to -Werror
getting passed to the liborcus configury, and liborcus apparently is
quite -Werror-unclean.
Thus also revert the initial fixes for those WaEs. (Many more would be
needed, it seems. I rather leave it to Kohei to make upstream liborcus
warning-free.
This reverts commit 083fa89dd8f894f9cd0ef217a900fab777db9f2a.
This reverts commit 7e871bbaf7b208dd884528259211385b8074da39.
This reverts commit 21b5706f83edecad8cd3d0ab3ce5110b82e75a46.
This reverts commit bed5557e8bdfe5c698a45a4cc82619a7c22de001.
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 9691c60..f67b48c 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--without-libzip \
--disable-debug \
--disable-spreadsheet-model \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(OUTDIR)/inc/external) $(gb_CXXFLAGS)" \
+ $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(GNUMAKE) \
&& touch $@
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index f6a054b..030eebd 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
orcus_patches :=
-# -Werror=unused-variable -Werror=unused-private-field -Werror=shadow
+# -Werror,-Wunused-variable -Werror,-Wunused-private-field
orcus_patches += liborcus_0.1.0-warnings.patch
# make config.sub recognize arm-linux-androideabi
orcus_patches += liborcus_0.1.0-configure.patch
diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch
index 9ba566c..8ce6533 100644
--- a/liborcus/liborcus_0.1.0-warnings.patch
+++ b/liborcus/liborcus_0.1.0-warnings.patch
@@ -60,48 +60,3 @@
}
else
{
---- include/orcus/pstring.hpp
-+++ include/orcus/pstring.hpp
-@@ -82,8 +82,8 @@
- };
-
- pstring() : m_pos(NULL), m_size(0) {}
-- pstring(const char* pos) : m_pos(pos) { m_size = ::std::strlen(pos); }
-- pstring(const char* pos, size_t size) : m_pos(pos), m_size(size) {}
-+ pstring(const char* pos_) : m_pos(pos_) { m_size = ::std::strlen(pos_); }
-+ pstring(const char* pos_, size_t size_) : m_pos(pos_), m_size(size_) {}
-
- ::std::string str() const { return ::std::string(m_pos, m_size); }
-
-@@ -110,11 +110,11 @@
-
- bool operator< (const pstring& r) const;
-
-- bool operator== (const char* str) const;
-+ bool operator== (const char* str_) const;
-
-- bool operator!= (const char* str) const
-+ bool operator!= (const char* str_) const
- {
-- return !operator==(str);
-+ return !operator==(str_);
- }
-
- pstring trim() const;
-
-
---- include/orcus/sax_parser.hpp
-+++ include/orcus/sax_parser.hpp
-@@ -159,9 +159,9 @@
-
- template<typename _Handler>
- sax_parser<_Handler>::sax_parser(
-- const char* content, const size_t size, handler_type& handler) :
-- m_content(content),
-- m_char(content),
-+ const char* content_, const size_t size, handler_type& handler) :
-+ m_content(content_),
-+ m_char(content_),
- m_size(size),
- m_pos(0),
- m_nest_level(0),
More information about the Libreoffice-commits
mailing list