config_host.mk.in | 215 ++++++++++++++++++-----------------
configure.ac | 5
libcdr/ExternalProject_libcdr.mk | 12 -
libvisio/ExternalProject_libvisio.mk | 8 -
mythes/ExternalProject_mythes.mk | 2
oox/source/ole/axcontrol.cxx | 21 ++-
oox/source/vml/vmldrawing.cxx | 3
7 files changed, 132 insertions(+), 134 deletions(-)
New commits:
commit 691c8fc64ce0711e8be93f4c454c537e51b1163e
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 9 14:28:43 2012 +0100
libcdr: move LCMS2_CFLAGS/LIBS setup to configure
Change-Id: I50f4396e6a8abf32d1a0f63cbfa93d2c59375326
diff --git a/configure.ac b/configure.ac
index 2439053..059d6e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7014,6 +7014,11 @@ if test "$with_system_lcms2" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LCMS2=NO
+ LCMS2_LIBS="-L${OUTDIR}/lib -llcms2"
+ LCMS2_CFLAGS="-I${WORKDIR}/UnpackedTarball/lcms2/include"
+ if test "$GCC" = "yes"; then
+ LCMS2_CFLAGS="${LCMS2_CFLAGS} -Wno-long-long"
+ fi
LCMS2_TARBALL="861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz"
BUILD_TYPE="$BUILD_TYPE LCMS2"
fi
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index f575dd8..f4dcab5 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -57,12 +57,6 @@ else
$(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR) \
&& PKG_CONFIG="" \
- $(if $(filter YES,$(SYSTEM_LCMS2)),\
- LCMS2_CFLAGS=" $(LCMS2_CFLAGS)" \
- LCMS2_LIBS=" $(LCMS2_LIBS)", \
- LCMS2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
- $(if $(filter MACOSX,$(OS)),-Wno-long-long)" \
- LCMS2_LIBS="-L$(OUTDIR)/lib -llcms2" ) \
./configure \
--with-pic \
--enable-static \
commit cedd9ebdd260e99e74ad54391c0d0b1d1ebd9891
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 9 14:20:42 2012 +0100
configure: define FOO_CFLAGS/FOO_LIBS so that they are never empty
This allows us to simply pass the already exported variables to invoked
configures, where the non-empty values will override the detection logic
there.
Change-Id: I7353a313814c58922e34843aeae380e5afa442ca
diff --git a/config_host.mk.in b/config_host.mk.in
index b1bc535..e98fc79 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -2,6 +2,13 @@
# this file is intented to be able to be included in a Makefile
# and not to be sourced in a shell session
#
+
+# Horrible hack to prepend spaces to expansions
+# Spaces are usually eaten by make parser but not if variable expands to space.
+# Space prefix is desirable because system CFLAGS may be completely empty,
+# which means that the variables defined here would need extra twiddling
+# to get them into invoked external configures and override pkg-config there.
+gb_SPACE:=$(gb_SPACE) $(gb_SPACE)
export SRC_ROOT=@SRC_ROOT@
export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
@@ -46,24 +53,24 @@ export BUILD_TYPE=@BUILD_TYPE@
export BUILD_UNOWINREG=@BUILD_UNOWINREG@
export BUILD_VER_STRING=@BUILD_VER_STRING@
export BUILD_X64=@BUILD_X64@
-export CAIRO_CFLAGS=@CAIRO_CFLAGS@
-export CAIRO_LIBS=@CAIRO_LIBS@
+export CAIRO_CFLAGS=$(gb_SPACE)@CAIRO_CFLAGS@
+export CAIRO_LIBS=$(gb_SPACE)@CAIRO_LIBS@
export CAIRO_TARBALL=@CAIRO_TARBALL@
export CC=@CC@
export CC_FOR_BUILD=@CC_FOR_BUILD@
-export CDR_CFLAGS=@CDR_CFLAGS@
-export CDR_LIBS=@CDR_LIBS@
+export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@
+export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
export CDR_TARBALL=@CDR_TARBALL@
ifneq ($(strip @CFLAGS@),)
export CFLAGS=@CFLAGS@
endif
export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
-export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
-export CLUCENE_LIBS=@CLUCENE_LIBS@
+export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
+export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
export CLUCENE_TARBALL=@CLUCENE_TARBALL@
-export CMIS_CFLAGS=@CMIS_CFLAGS@
-export CMIS_LIBS=@CMIS_LIBS@
+export CMIS_CFLAGS=$(gb_SPACE)@CMIS_CFLAGS@
+export CMIS_LIBS=$(gb_SPACE)@CMIS_LIBS@
export CMIS_TARBALL=@CMIS_TARBALL@
export COM=@COM@
export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
@@ -76,8 +83,8 @@ export COMPATH=@COMPATH@
export COMPILER_PLUGINS=@COMPILER_PLUGINS@
export COMP_ENV=@OUTPATH@
export COM_FOR_BUILD=@COM_FOR_BUILD@
-export CPPUNIT_CFLAGS=@CPPUNIT_CFLAGS@
-export CPPUNIT_LIBS=@CPPUNIT_LIBS@
+export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
+export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPPUNIT_TARBALL=@CPPUNIT_TARBALL@
export CPU=@CPU@
export CPUNAME=@CPUNAME@
@@ -86,8 +93,8 @@ export CPU_FOR_BUILD=@CPU_FOR_BUILD@
export CROSS_COMPILING=@CROSS_COMPILING@
export CT2N_TARBALL=@CT2N_TARBALL@
export CURL_TARBALL=@CURL_TARBALL@
-export CURL_CFLAGS=@CURL_CFLAGS@
-export CURL_LIBS=@CURL_LIBS@
+export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
+export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@
export CXX=@CXX@
export CXX_FOR_BUILD=@CXX_FOR_BUILD@
export CXX_X64_BINARY=@CXX_X64_BINARY@
@@ -96,10 +103,10 @@ export CXXFLAGS=@CXXFLAGS@
endif
export DATADIR=@DATADIR@
export DBGHELP_DLL=@DBGHELP_DLL@
-export DBUSMENUGTK_CFLAGS=@DBUSMENUGTK_CFLAGS@
-export DBUSMENUGTK_LIBS=@DBUSMENUGTK_LIBS@
-export DBUS_CFLAGS=@DBUS_CFLAGS@
-export DBUS_LIBS=@DBUS_LIBS@
+export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
+export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
+export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
+export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
export DB_CPPLIB=@DB_CPPLIB@
export DB_LIB=@DB_LIB@
export debug=@ENABLE_DEBUG@
@@ -195,47 +202,47 @@ export FONT_PTSERIF_TARBALL=@FONT_PTSERIF_TARBALL@
export FONT_OPENSANS_TARBALL=@FONT_OPENSANS_TARBALL@
export FONT_SOURCESANS_TARBALL=@FONT_SOURCESANS_TARBALL@
export FONT_SOURCECODE_TARBALL=@FONT_SOURCECODE_TARBALL@
-export FONTCONFIG_CFLAGS=@FONTCONFIG_CFLAGS@
-export FONTCONFIG_LIBS=@FONTCONFIG_LIBS@
+export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@
+export FONTCONFIG_LIBS=$(gb_SPACE)@FONTCONFIG_LIBS@
export FONTCONFIG_TARBALL=@FONTCONFIG_TARBALL@
export FRAMEWORKSHOME=@FRAMEWORKSHOME@
-export FREETYPE_CFLAGS=@FREETYPE_CFLAGS@
-export FREETYPE_LIBS=@FREETYPE_LIBS@
+export FREETYPE_CFLAGS=$(gb_SPACE)@FREETYPE_CFLAGS@
+export FREETYPE_LIBS=$(gb_SPACE)@FREETYPE_LIBS@
export FREETYPE_TARBALL=@FREETYPE_TARBALL@
-export GCONF_CFLAGS=@GCONF_CFLAGS@
-export GCONF_LIBS=@GCONF_LIBS@
-export GIO_CFLAGS=@GIO_CFLAGS@
-export GIO_LIBS=@GIO_LIBS@
+export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
+export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
+export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
+export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export PARALLELISM=@PARALLELISM@
-export GNOMEVFS_CFLAGS=@GNOMEVFS_CFLAGS@
-export GNOMEVFS_LIBS=@GNOMEVFS_LIBS@
+export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
+export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@
@x_GNUCP@ export GNUCOPY=@GNUCP@
export GNUMAKE=@GNUMAKE@
export GNUPATCH=@GNUPATCH@
export GNUTAR=@GNUTAR@
-export GOBJECT_CFLAGS=@GOBJECT_CFLAGS@
-export GOBJECT_LIBS=@GOBJECT_LIBS@
+export GOBJECT_CFLAGS=$(gb_SPACE)@GOBJECT_CFLAGS@
+export GOBJECT_LIBS=$(gb_SPACE)@GOBJECT_LIBS@
export GOOGLE_DOCS_EXTENSION_PACK=@GOOGLE_DOCS_EXTENSION_PACK@
export GPERF=@GPERF@
export GPERF=@GPERF@
-export GRAPHITE_CFLAGS=@GRAPHITE_CFLAGS@
-export GRAPHITE_LIBS=@GRAPHITE_LIBS@
+export GRAPHITE_CFLAGS=$(gb_SPACE)@GRAPHITE_CFLAGS@
+export GRAPHITE_LIBS=$(gb_SPACE)@GRAPHITE_LIBS@
export GRAPHITE_TARBALL=@GRAPHITE_TARBALL@
@x_Cygwin@ export GREP=@WIN_GREP@
-export GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@
-export GSTREAMER_LIBS=@GSTREAMER_LIBS@
-export GSTREAMER_0_10_CFLAGS=@GSTREAMER_0_10_CFLAGS@
-export GSTREAMER_0_10_LIBS=@GSTREAMER_0_10_LIBS@
-export GTHREAD_CFLAGS=@GTHREAD_CFLAGS@
-export GTHREAD_LIBS=@GTHREAD_LIBS@
-export GTK3_CFLAGS=@GTK3_CFLAGS@
-export GTK3_LIBS=@GTK3_LIBS@
-export GTK_CFLAGS=@GTK_CFLAGS@
-export GTK_LIBS=@GTK_LIBS@
-export GTK_PRINT_CFLAGS=@GTK_PRINT_CFLAGS@
-export GTK_PRINT_LIBS=@GTK_PRINT_LIBS@
+export GSTREAMER_CFLAGS=$(gb_SPACE)@GSTREAMER_CFLAGS@
+export GSTREAMER_LIBS=$(gb_SPACE)@GSTREAMER_LIBS@
+export GSTREAMER_0_10_CFLAGS=$(gb_SPACE)@GSTREAMER_0_10_CFLAGS@
+export GSTREAMER_0_10_LIBS=$(gb_SPACE)@GSTREAMER_0_10_LIBS@
+export GTHREAD_CFLAGS=$(gb_SPACE)@GTHREAD_CFLAGS@
+export GTHREAD_LIBS=$(gb_SPACE)@GTHREAD_LIBS@
+export GTK3_CFLAGS=$(gb_SPACE)@GTK3_CFLAGS@
+export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@
+export GTK_CFLAGS=$(gb_SPACE)@GTK_CFLAGS@
+export GTK_LIBS=$(gb_SPACE)@GTK_LIBS@
+export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
+export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
export GUI=@GUI@
export GUIBASE=@GUIBASE@
export GUIBASE_FOR_BUILD=@GUIBASE_FOR_BUILD@
@@ -267,9 +274,9 @@ export HSQLDB_TARBALL=@HSQLDB_TARBALL@
export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@
export HUNART_EXTENSION_PACK=@HUNART_EXTENSION_PACK@
export HUNSPELL_TARBALL=@HUNSPELL_TARBALL@
-export HUNSPELL_CFLAGS=@HUNSPELL_CFLAGS@
-export HUNSPELL_LIBS=@HUNSPELL_LIBS@
-export HYPHEN_LIB=@HYPHEN_LIB@
+export HUNSPELL_CFLAGS=$(gb_SPACE)@HUNSPELL_CFLAGS@
+export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@
+export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@
export HYPHEN_TARBALL=@HYPHEN_TARBALL@
export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@
export ICECREAM_RUN=@ICECREAM_RUN@
@@ -303,19 +310,19 @@ export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
export JFREEREPORT_JAR=@JFREEREPORT_JAR@
export JPEG_TARBALL=@JPEG_TARBALL@
export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
-export TDE_CFLAGS=@TDE_CFLAGS@
-export TDE_LIBS=@TDE_LIBS@
-export KDE4_CFLAGS=@KDE4_CFLAGS@
-export KDE4_LIBS=@KDE4_LIBS@
-export KDE_CFLAGS=@KDE_CFLAGS@
-export KDE_GLIB_CFLAGS=@KDE_GLIB_CFLAGS@
-export KDE_GLIB_LIBS=@KDE_GLIB_LIBS@
+export TDE_CFLAGS=$(gb_SPACE)@TDE_CFLAGS@
+export TDE_LIBS=$(gb_SPACE)@TDE_LIBS@
+export KDE4_CFLAGS=$(gb_SPACE)@KDE4_CFLAGS@
+export KDE4_LIBS=$(gb_SPACE)@KDE4_LIBS@
+export KDE_CFLAGS=$(gb_SPACE)@KDE_CFLAGS@
+export KDE_GLIB_CFLAGS=$(gb_SPACE)@KDE_GLIB_CFLAGS@
+export KDE_GLIB_LIBS=$(gb_SPACE)@KDE_GLIB_LIBS@
export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@
-export KDE_LIBS=@KDE_LIBS@
+export KDE_LIBS=$(gb_SPACE)@KDE_LIBS@
export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@
export L10N_MODULE=@L10N_MODULE@
-export LCMS2_CFLAGS=@LCMS2_CFLAGS@
-export LCMS2_LIBS=@LCMS2_LIBS@
+export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
+export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
export LCMS2_TARBALL=@LCMS2_TARBALL@
ifneq ($(strip @LDFLAGS@),)
export LDFLAGS=@LDFLAGS@
@@ -323,31 +330,31 @@ endif
export LFS_CFLAGS=@LFS_CFLAGS@
export LIBBASE_JAR=@LIBBASE_JAR@
export LIBDIR=@LIBDIR@
-export LIBEXSLT_CFLAGS=@LIBEXSLT_CFLAGS@
-export LIBEXSLT_LIBS=@LIBEXSLT_LIBS@
-export LIBEXTTEXTCAT_CFLAGS=@LIBEXTTEXTCAT_CFLAGS@
-export LIBEXTTEXTCAT_LIBS=@LIBEXTTEXTCAT_LIBS@
+export LIBEXSLT_CFLAGS=$(gb_SPACE)@LIBEXSLT_CFLAGS@
+export LIBEXSLT_LIBS=$(gb_SPACE)@LIBEXSLT_LIBS@
+export LIBEXTTEXTCAT_CFLAGS=$(gb_SPACE)@LIBEXTTEXTCAT_CFLAGS@
+export LIBEXTTEXTCAT_LIBS=$(gb_SPACE)@LIBEXTTEXTCAT_LIBS@
export LIBEXTTEXTCAT_TARBALL=@LIBEXTTEXTCAT_TARBALL@
export LIBFONTS_JAR=@LIBFONTS_JAR@
export LIBFORMULA_JAR=@LIBFORMULA_JAR@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
-export LIBLANGTAG_CFLAGS=@LIBLANGTAG_CFLAGS@
-export LIBLANGTAG_LIBS=@LIBLANGTAG_LIBS@
+export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
+export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
export LIBLANGTAG_TARBALL=@LIBLANGTAG_TARBALL@
export LIBLOADER_JAR=@LIBLOADER_JAR@
export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
export LIBMYSQL_PATH=@LIBMYSQL_PATH@
-export LIBPNG_CFLAGS=@LIBPNG_CFLAGS@
-export LIBPNG_LIBS=@LIBPNG_LIBS@
+export LIBPNG_CFLAGS$(gb_SPACE)=@LIBPNG_CFLAGS@
+export LIBPNG_LIBS=$(gb_SPACE)@LIBPNG_LIBS@
export LIBREPOSITORY_JAR=@LIBREPOSITORY_JAR@
export LIBSERIALIZER_JAR=@LIBSERIALIZER_JAR@
-export LIBXML_CFLAGS=@LIBXML_CFLAGS@
+export LIBXML_CFLAGS=$(gb_SPACE)@LIBXML_CFLAGS@
export LIBXML_JAR=@LIBXML_JAR@
-export LIBXML_LIBS=@LIBXML_LIBS@
+export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@
export LIBXML_TARBALL=@LIBXML_TARBALL@
export LIBXMLSEC_TARBALL=@LIBXMLSEC_TARBALL@
-export LIBXSLT_CFLAGS=@LIBXSLT_CFLAGS@
-export LIBXSLT_LIBS=@LIBXSLT_LIBS@
+export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@
+export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
export LIBXSLT_TARBALL=@LIBXSLT_TARBALL@
export LINK_X64_BINARY=@LINK_X64_BINARY@
export LPSOLVE_TARBALL=@LPSOLVE_TARBALL@
@@ -359,7 +366,7 @@ export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@
export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@
export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@
-export MDDS_CPPFLAGS=@MDDS_CPPFLAGS@
+export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
export MDDS_TARBALL=@MDDS_TARBALL@
export MERGELIBS=@MERGELIBS@
export MFC_INCLUDE=@MFC_INCLUDE@
@@ -429,30 +436,30 @@ export ML_EXE=@ML_EXE@
export MOC4=@MOC4@
export MOC=@MOC@
export MOZILLABUILD=@MOZILLABUILD@
-export MOZILLA_HEADERS_CFLAGS=@MOZILLA_HEADERS_CFLAGS@
+export MOZILLA_HEADERS_CFLAGS=$(gb_SPACE)@MOZILLA_HEADERS_CFLAGS@
export MOZILLA_VERSION=@MOZILLA_VERSION@
export MOZ_FLAVOUR=@MOZ_FLAVOUR@
export MOZ_INC=@MOZ_INC@
export MOZ_LIB=@MOZ_LIB@
export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
-export MSPUB_CFLAGS=@MSPUB_CFLAGS@
-export MSPUB_LIBS=@MSPUB_LIBS@
+export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
+export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
export MSPUB_TARBALL=@MSPUB_TARBALL@
export MYSQL_DEFINES=@MYSQL_DEFINES@
export MYSQL_INC=@MYSQL_INC@
export MYSQL_LIB=@MYSQL_LIB@
export MYSQLCPPCONN_TARBALL=@MYSQLCPPCONN_TARBALL@
-export MYTHES_CFLAGS=@MYTHES_CFLAGS@
-export MYTHES_LIBS=@MYTHES_LIBS@
+export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@
+export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@
export MYTHES_TARBALL=@MYTHES_TARBALL@
-export NEON_CFLAGS=@NEON_CFLAGS@
-export NEON_LIBS=@NEON_LIBS@
+export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@
+export NEON_LIBS=$(gb_SPACE)@NEON_LIBS@
export NEON_TARBALL=@NEON_TARBALL@
export NEON_VERSION=@NEON_VERSION@
export NM=@NM@
export nodep=@nodep@
-export NSS_CFLAGS=@NSS_CFLAGS@
-export NSS_LIBS=@NSS_LIBS@
+export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@
+export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@
export NSS_TARBALL=@NSS_TARBALL@
export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
ifneq ($(strip @OBJCFLAGS@),)
@@ -472,11 +479,11 @@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
export OOO_SHELL=@BASH@
export OOO_VENDOR=@OOO_VENDOR@
export OPENLDAP_TARBALL=@OPENLDAP_TARBALL@
-export OPENSSL_CFLAGS=@OPENSSL_CFLAGS@
-export OPENSSL_LIBS=@OPENSSL_LIBS@
+export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
+export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
export OPENSSL_TARBALL=@OPENSSL_TARBALL@
-export ORCUS_CFLAGS=@ORCUS_CFLAGS@
-export ORCUS_LIBS=@ORCUS_LIBS@
+export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
+export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
export ORCUS_TARBALL=@ORCUS_TARBALL@
export OS=@OS@
export OSVERSION=@OSVERSION@
@@ -495,8 +502,8 @@ export PKGMK=@PKGMK@
export PKG_CONFIG=@PKG_CONFIG@
export PLATFORMID=@PLATFORMID@
export PNG_TARBALL=@PNG_TARBALL@
-export POPPLER_CFLAGS=@POPPLER_CFLAGS@
-export POPPLER_LIBS=@POPPLER_LIBS@
+export POPPLER_CFLAGS=$(gb_SPACE)@POPPLER_CFLAGS@
+export POPPLER_LIBS=$(gb_SPACE)@POPPLER_LIBS@
export POSTGRESQL_INC=@POSTGRESQL_INC@
export POSTGRESQL_LIB=@POSTGRESQL_LIB@
export POSTGRESQL_TARBALL=@POSTGRESQL_TARBALL@
@@ -516,15 +523,15 @@ export PSPRINT=TRUE
export PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
export PTHREAD_LIBS=@PTHREAD_LIBS@
export PYTHON=@PYTHON@
-export PYTHON_CFLAGS=@PYTHON_CFLAGS@
+export PYTHON_CFLAGS=$(gb_SPACE)@PYTHON_CFLAGS@
export PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
-export PYTHON_LIBS=@PYTHON_LIBS@
+export PYTHON_LIBS=$(gb_SPACE)@PYTHON_LIBS@
export PYTHON_TARBALL=@PYTHON_TARBALL@
export RANLIB=@RANLIB@
export RAPTOR_TARBALL=@RAPTOR_TARBALL@
export RASQAL_TARBALL=@RASQAL_TARBALL@
-export REDLAND_CFLAGS=@REDLAND_CFLAGS@
-export REDLAND_LIBS=@REDLAND_LIBS@
+export REDLAND_CFLAGS=$(gb_SPACE)@REDLAND_CFLAGS@
+export REDLAND_LIBS=$(gb_SPACE)@REDLAND_LIBS@
export REDLAND_TARBALL=@REDLAND_TARBALL@
export RHINO_JAR=@RHINO_JAR@
export RHINO_TARBALL=@RHINO_TARBALL@
@@ -642,8 +649,8 @@ export SYSTEM_UCPP=@SYSTEM_UCPP@
export SYSTEM_VIGRA=@SYSTEM_VIGRA@
export SYSTEM_ZLIB=@SYSTEM_ZLIB@
export TARFILE_LOCATION=@TARFILE_LOCATION@
-export TELEPATHY_CFLAGS=@TELEPATHY_CFLAGS@
-export TELEPATHY_LIBS=@TELEPATHY_LIBS@
+export TELEPATHY_CFLAGS=$(gb_SPACE)@TELEPATHY_CFLAGS@
+export TELEPATHY_LIBS=$(gb_SPACE)@TELEPATHY_LIBS@
export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
@x_Cygwin@ export TMP=@TMP_DIRECTORY@
export TMPDIR=@TEMP_DIRECTORY@
@@ -657,13 +664,13 @@ export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@
export use_shl_version=@use_shl_version@
export USE_XINERAMA=@USE_XINERAMA@
export UUIDGEN=@UUIDGEN@
-export VALGRIND_CFLAGS=@VALGRIND_CFLAGS@
+export VALGRIND_CFLAGS=$(gb_SPACE)@VALGRIND_CFLAGS@
export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
export VCVER=@VCVER@
export VERBOSE=@VERBOSE@
export VIGRA_TARBALL=@VIGRA_TARBALL@
-export VISIO_CFLAGS=@VISIO_CFLAGS@
-export VISIO_LIBS=@VISIO_LIBS@
+export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@
+export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@
export VISIO_TARBALL=@VISIO_TARBALL@
export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
@@ -696,25 +703,25 @@ export WORDS_BIGENDIAN=@WORDS_BIGENDIAN@
export WORKDIR=@WORKDIR@
export WORKDIR_FOR_BUILD=@WORKDIR_FOR_BUILD@
export WORK_STAMP=@SOURCEVERSION@
-export WPD_CFLAGS=@WPD_CFLAGS@
-export WPD_LIBS=@WPD_LIBS@
+export WPD_CFLAGS=$(gb_SPACE)@WPD_CFLAGS@
+export WPD_LIBS=$(gb_SPACE)@WPD_LIBS@
export WPD_TARBALL=@WPD_TARBALL@
-export WPG_CFLAGS=@WPG_CFLAGS@
-export WPG_LIBS=@WPG_LIBS@
+export WPG_CFLAGS=$(gb_SPACE)@WPG_CFLAGS@
+export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
export WPG_TARBALL=@WPG_TARBALL@
-export WPS_CFLAGS=@WPS_CFLAGS@
-export WPS_LIBS=@WPS_LIBS@
+export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
+export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
export WPS_TARBALL=@WPS_TARBALL@
export XINERAMA_LINK=@XINERAMA_LINK@
export XMLLINT=@XMLLINT@
export XPDF_TARBALL=@XPDF_TARBALL@
-export XRANDR_CFLAGS=@XRANDR_CFLAGS@
+export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@
export XRANDR_DLOPEN=@XRANDR_DLOPEN@
-export XRANDR_LIBS=@XRANDR_LIBS@
-export XRENDER_CFLAGS=@XRENDER_CFLAGS@
-export XRENDER_LIBS=@XRENDER_LIBS@
+export XRANDR_LIBS=$(gb_SPACE)@XRANDR_LIBS@
+export XRENDER_CFLAGS=$(gb_SPACE)@XRENDER_CFLAGS@
+export XRENDER_LIBS=$(gb_SPACE)@XRENDER_LIBS@
export XSLTML_TARBALL=@XSLTML_TARBALL@
export XSLTPROC=@XSLTPROC@
-export ZLIB_CFLAGS=@ZLIB_CFLAGS@
-export ZLIB_LIBS=@ZLIB_LIBS@
+export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
+export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
export ZLIB_TARBALL=@ZLIB_TARBALL@
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 007f2e0..f575dd8 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -57,18 +57,12 @@ else
$(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR) \
&& PKG_CONFIG="" \
- WPD_CFLAGS=" $(WPD_CFLAGS)" \
- WPD_LIBS=" $(WPD_LIBS)" \
- WPG_CFLAGS=" $(WPG_CFLAGS)" \
- WPG_LIBS=" $(WPG_LIBS)" \
$(if $(filter YES,$(SYSTEM_LCMS2)),\
LCMS2_CFLAGS=" $(LCMS2_CFLAGS)" \
LCMS2_LIBS=" $(LCMS2_LIBS)", \
LCMS2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
$(if $(filter MACOSX,$(OS)),-Wno-long-long)" \
LCMS2_LIBS="-L$(OUTDIR)/lib -llcms2" ) \
- ZLIB_CFLAGS=" $(ZLIB_CFLAGS)" \
- ZLIB_LIBS=" $(ZLIB_LIBS)" \
./configure \
--with-pic \
--enable-static \
diff --git a/libvisio/ExternalProject_libvisio.mk
b/libvisio/ExternalProject_libvisio.mk
index 8abe639..637a4a0 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -56,14 +56,6 @@ else
$(call gb_ExternalProject_get_state_target,libvisio,build) :
cd $(EXTERNAL_WORKDIR) \
&& PKG_CONFIG="" \
- WPD_CFLAGS=" $(WPD_CFLAGS)" \
- WPD_LIBS=" $(WPD_LIBS)" \
- WPG_CFLAGS=" $(WPG_CFLAGS)" \
- WPG_LIBS=" $(WPG_LIBS)" \
- LIBXML_CFLAGS=" $(LIBXML_CFLAGS)" \
- LIBXML_LIBS=" $(LIBXML_LIBS)" \
- ZLIB_CFLAGS=" $(ZLIB_CFLAGS)" \
- ZLIB_LIBS=" $(ZLIB_LIBS)" \
./configure \
--with-pic \
--enable-static \
diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index e88d793..79755af 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -21,8 +21,6 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
cd $(EXTERNAL_WORKDIR) \
&& LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic
\
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM) gio_can_sniff=no) \
- HUNSPELL_CFLAGS=" $(HUNSPELL_CFLAGS)" \
- HUNSPELL_LIBS=" $(HUNSPELL_LIBS)" \
$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
&& $(MAKE) \
&& touch $@
commit 5f78685ebf4be192cbf5168424e5ca98bbe48d6f
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 9 00:20:11 2012 +0100
oox: make things easier to debug by tracing exceptions
Change-Id: I05df8435874eb65f3acedaaea50b4910e9fc9111
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 28b49be..f2b2bc8 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -194,8 +194,9 @@ bool lclExtractRangeFromName( CellRangeAddress&
orRangeAddr, const Reference< XM
orRangeAddr = xAddressable->getRangeAddress();
return true;
}
- catch(const Exception& )
+ catch (const Exception& e)
{
+ SAL_WARN("oox", "exception: " << e.Message);
}
return false;
}
@@ -226,8 +227,9 @@ void lclPrepareConverter( PropertySet& rConverter, const
Reference< XModel >& rx
CREATE_OUSTRING( "com.sun.star.table.CellAddressConversion" );
rConverter.set( xModelFactory->createInstance( aServiceName ) );
}
- catch(const Exception& )
+ catch (const Exception& e)
{
+ SAL_WARN("oox", "exception: " << e.Message);
}
rConverter.setProperty( PROP_XLA1Representation, rAddressString );
rConverter.setProperty( PROP_ReferenceSheet, nRefSheet );
@@ -372,8 +374,9 @@ void ControlConverter::bindToSources( const Reference<
XControlModel >& rxCtrlMo
CREATE_OUSTRING( "com.sun.star.table.CellValueBinding" ), aArgs ),
UNO_QUERY_THROW );
xBindable->setValueBinding( xBinding );
}
- catch(const Exception& )
+ catch (const Exception& e)
{
+ SAL_WARN("oox", "exception: " << e.Message);
}
// list entry source
@@ -404,8 +407,9 @@ void ControlConverter::bindToSources( const Reference<
XControlModel >& rxCtrlMo
CREATE_OUSTRING( "com.sun.star.table.CellRangeListSource" ),
aArgs ), UNO_QUERY_THROW );
xEntrySink->setListEntrySource( xEntrySource );
}
- catch(const Exception& )
+ catch (const Exception& e)
{
+ SAL_WARN("oox", "exception: " << e.Message);
}
}
@@ -2554,8 +2558,9 @@ bool EmbeddedControl::convertProperties( const Reference<
XControlModel >& rxCtr
{
aPropMap.setProperty( PROP_GenerateVbaEvents, true);
}
- catch(const Exception& )
+ catch (const Exception& e)
{
+ SAL_WARN("oox", "exception: " << e.Message);
}
mxModel->convertProperties( aPropMap, rConv );
PropertySet aPropSet( rxCtrlModel );
@@ -2606,8 +2611,9 @@ Reference< XControlModel >
EmbeddedForm::convertAndInsert( const EmbeddedControl
if( rControl.convertProperties( xCtrlModel, maControlConv ) )
return xCtrlModel;
}
- catch(const Exception& )
+ catch (const Exception& e)
{
+ SAL_WARN("oox", "exception creating Control: " << e.Message);
}
return Reference< XControlModel >();
}
@@ -2631,8 +2637,9 @@ Reference< XIndexContainer > EmbeddedForm::createXForm()
mxFormIC.set( xForm, UNO_QUERY_THROW );
}
}
- catch(const Exception& )
+ catch (const Exception& e)
{
+ SAL_WARN("oox", "exception creating Form: " << e.Message);
}
// always clear the forms supplier to not try to create the form again
mxFormsSupp.clear();
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 58eb29b..1406ebe 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -253,8 +253,9 @@ Reference< XShape > Drawing::createAndInsertXControlShape(
const ::oox::ole::Emb
// set the control model at the shape
Reference< XControlShape >( xShape, UNO_QUERY_THROW )->setControl(
xCtrlModel );
}
- catch( Exception& )
+ catch (Exception const& e)
{
+ SAL_WARN("oox", "exception inserting Shape: " << e.Message);
}
return xShape;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
