[Libreoffice-commits] .: liborcus/liborcus_0.1.0-mingw.patch liborcus/makefile.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 10 01:30:22 PDT 2012
liborcus/liborcus_0.1.0-mingw.patch | 123 ++++++++++++++++++++++++++++++++++++
liborcus/makefile.mk | 3
2 files changed, 126 insertions(+)
New commits:
commit 26fd65c521fb4667f1be0365de4b391f61b80fdf
Author: David Tardon <dtardon at redhat.com>
Date: Mon Sep 10 10:27:36 2012 +0200
fix mingw build
Change-Id: I26349524db04886b939fb4b79e2feab1605beee5
diff --git a/liborcus/liborcus_0.1.0-mingw.patch b/liborcus/liborcus_0.1.0-mingw.patch
new file mode 100644
index 0000000..e87f9a8
--- /dev/null
+++ b/liborcus/liborcus_0.1.0-mingw.patch
@@ -0,0 +1,123 @@
++++ misc/build/liborcus_0.1.0/configure.dt
++++ misc/build/liborcus_0.1.0/configure
+@@ -619,6 +619,8 @@ WITH_LIBZIP_FALSE
+ WITH_LIBZIP_TRUE
+ LIBZIP_LIBS
+ LIBZIP_CFLAGS
++HAVE_STATIC_LIB_FALSE
++HAVE_STATIC_LIB_TRUE
+ ORCUS_API_VERSION
+ LIBOBJS
+ POW_LIB
+@@ -15985,6 +15987,18 @@ if test x"$enable_werror" != "xno"; then
+
+ fi
+
++# =========================================================
++# Determine if we are going to build static lib (for MinGW)
++# =========================================================
++ if test "$enable_shared" = no -a "$enable_static" = yes; then
++ HAVE_STATIC_LIB_TRUE=
++ HAVE_STATIC_LIB_FALSE='#'
++else
++ HAVE_STATIC_LIB_TRUE='#'
++ HAVE_STATIC_LIB_FALSE=
++fi
++
++
+ # =====
+ # Debug
+ # =====
+@@ -16413,6 +16427,10 @@ if test -z "${am__fastdepCXX_TRUE}" && t
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${HAVE_STATIC_LIB_TRUE}" && test -z "${HAVE_STATIC_LIB_FALSE}"; then
++ as_fn_error $? "conditional \"HAVE_STATIC_LIB\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${WITH_LIBZIP_TRUE}" && test -z "${WITH_LIBZIP_FALSE}"; then
+ as_fn_error $? "conditional \"WITH_LIBZIP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
++++ misc/build/liborcus_0.1.0/src/liborcus/Makefile.in.dt
++++ misc/build/liborcus_0.1.0/src/liborcus/Makefile.in
+@@ -362,7 +361,8 @@ INCDIR = $(top_srcdir)/include
+ SRCDIR = $(top_srcdir)/src/liborcus
+ BINDIR = $(top_srcdir)/bin
+ INCLUDES = -I$(top_srcdir)/include
+-AM_CXXFLAGS = -D__ORCUS_BUILDING_DLL=1
++ at HAVE_STATIC_LIB_FALSE@AM_CPPFLAGS = -D__ORCUS_BUILDING_DLL=1
++ at HAVE_STATIC_LIB_TRUE@AM_CPPFLAGS = -D__ORCUS_STATIC_LIB=1
+ lib_LTLIBRARIES = liborcus- at ORCUS_API_VERSION@.la
+ liborcus_ at ORCUS_API_VERSION@_la_SOURCES = dom_tree.cpp exception.cpp \
+ global.cpp spreadsheet_interface.cpp orcus_css.cpp \
++++ misc/build/liborcus_0.1.0/src/Makefile.in.dt
++++ misc/build/liborcus_0.1.0/src/Makefile.in
+@@ -37,26 +37,35 @@ host_triplet = @host@
+ bin_PROGRAMS = orcus-xml-dump$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3)
+ EXTRA_PROGRAMS = orcus-test-common$(EXEEXT) orcus-test-xml$(EXEEXT) \
+ $(am__EXEEXT_1)
++ at HAVE_STATIC_LIB_TRUE@am__append_1 = -D__ORCUS_STATIC_LIB=1
++ at HAVE_STATIC_LIB_TRUE@am__append_2 = -D__ORCUS_STATIC_LIB=1
++ at HAVE_STATIC_LIB_TRUE@am__append_3 = -D__ORCUS_STATIC_LIB=1
+ TESTS = orcus-test-common$(EXEEXT) orcus-test-xml$(EXEEXT) \
+ $(am__EXEEXT_1)
+
+ #----------------------------------------------------------------------------
+ # spreadsheet model
+ #----------------------------------------------------------------------------
+- at BUILD_SPREADSHEET_MODEL_TRUE@am__append_1 = \
++ at BUILD_SPREADSHEET_MODEL_TRUE@am__append_4 = \
+ @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-csv orcus-xml
+
+- at BUILD_SPREADSHEET_MODEL_TRUE@am__append_2 = \
++ at BUILD_SPREADSHEET_MODEL_TRUE@am__append_5 = \
+ @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-test-csv \
+ @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-test-xml-mapped
+
+- at BUILD_SPREADSHEET_MODEL_TRUE@am__append_3 = \
++ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE at am__append_6 = -D__ORCUS_STATIC_LIB=1
++ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE at am__append_7 = -D__ORCUS_STATIC_LIB=1
++ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE at am__append_8 = -D__ORCUS_STATIC_LIB=1
++ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE at am__append_9 = -D__ORCUS_STATIC_LIB=1
++ at BUILD_SPREADSHEET_MODEL_TRUE@am__append_10 = \
+ @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-test-csv \
+ @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-test-xml-mapped
+
+- at BUILD_SPREADSHEET_MODEL_TRUE@@WITH_LIBZIP_TRUE at am__append_4 = \
++ at BUILD_SPREADSHEET_MODEL_TRUE@@WITH_LIBZIP_TRUE at am__append_11 = \
+ @BUILD_SPREADSHEET_MODEL_TRUE@@WITH_LIBZIP_TRUE@ orcus-ods orcus-xlsx
+
++ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE@@WITH_LIBZIP_TRUE at am__append_12 = -D__ORCUS_STATIC_LIB=1
++ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE@@WITH_LIBZIP_TRUE at am__append_13 = -D__ORCUS_STATIC_LIB=1
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -344,21 +353,24 @@ orcus_format_xml_SOURCES = orcus_format_xml.
+ orcus_format_xml_LDADD = \
+ liborcus/liborcus- at ORCUS_API_VERSION@.la
+
+-orcus_format_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la
++orcus_format_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la \
++ $(am__append_1)
+
+ # orcus-test-common
+ orcus_test_common_SOURCES = orcus_test_common.cpp
+ orcus_test_common_LDADD = \
+ liborcus/liborcus- at ORCUS_API_VERSION@.la
+
+-orcus_test_common_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la
++orcus_test_common_CPPFLAGS = \
++ -I$(top_builddir)/lib/liborcus/liborcus.la $(am__append_2)
+
+ # orcus-test-xml
+ orcus_test_xml_SOURCES = orcus_test_xml.cpp
+ orcus_test_xml_LDADD = \
+ liborcus/liborcus- at ORCUS_API_VERSION@.la
+
+-orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la
++orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la \
++ $(am__append_3)
+
+ # orcus-csv
+ @BUILD_SPREADSHEET_MODEL_TRUE at orcus_csv_SOURCES = \
diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk
index 2a67035..4acf2d8 100644
--- a/liborcus/makefile.mk
+++ b/liborcus/makefile.mk
@@ -41,6 +41,9 @@ PATCH_FILES=liborcus_0.1.0-warnings.patch
PATCH_FILES+=liborcus_0.1.0-configure.patch
# make config.sub recognize arm-linux-androideabi
+# fix MinGW build
+PATCH_FILES+=liborcus_0.1.0-mingw.patch
+
.IF "$(GUI)$(COM)"=="WNTMSC"
BUILD_DIR=vsprojects/liborcus-static-nozip
More information about the Libreoffice-commits
mailing list