RepositoryExternal.mk | 18 +++++++++++++++---
configure.ac | 6 +++++-
external/libodfgen/ExternalProject_libodfgen.mk | 2 +-
external/librevenge/ExternalProject_librevenge.mk | 2 +-
4 files changed, 22 insertions(+), 6 deletions(-)
New commits:
commit 0b7d0a82b20c495d4f031ba45ddec01ee01c2a76
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 25 13:19:31 2014 +0200
always provide REDLAND_CFLAGS/LIBS to ext. projects
Change-Id: Iad1004503e91fbaf6251edc50b20d89ddbb15efa
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 920436a..2ecd404 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1784,7 +1784,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
define gb_LinkTarget__use_revenge
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \
+ $(REVENGE_CFLAGS) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_libraries,$(1),\
@@ -1808,11 +1808,11 @@ define gb_LinkTarget__use_revenge
$(call gb_LinkTarget_use_package,$(1),librevenge)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \
+ $(REVENGE_CFLAGS) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,librevenge)/src/lib/.libs
-lrevenge-0.0 \
+ $(REVENGE_LIBS) \
)
endef
diff --git a/configure.ac b/configure.ac
index ad27916..5adefd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7665,7 +7665,11 @@ AC_SUBST([ENABLE_EOT])
dnl ===================================================================
dnl Check for system librevenge
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0])
+AS_IF([test "$COM" = "MSC"],
+ [librevenge_libdir="${WORKDIR}/LinkTarget/Library"],
+ [librevenge_libdir="${WORKDIR}/UnpackedTarball/lirevenge/src/lib/.libs"]
+)
+libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir}
-lrevenge-0.0"]),
dnl ===================================================================
dnl Check for system libe-book
commit 7c9c779cfb80a44e22aebf8cb1f22a26b282898d
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 25 13:06:57 2014 +0200
fix deps for projects using librevenge
Change-Id: Icc6e2465d96cc95b229a1f7abc6d51362ae3d016
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 13eb221..920436a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1772,6 +1772,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(REVENGE_LIBS))
endef
+gb_ExternalProject__use_revenge :=
+
else # !SYSTEM_REVENGE
ifeq ($(COM),MSC)
@@ -1791,6 +1793,11 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef
+define gb_ExternalProject__use_revenge
+$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call
gb_Library_get_target,revenge)
+
+endef
+
else # !MSC
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
@@ -1809,6 +1816,11 @@ $(call gb_LinkTarget_add_libs,$(1),\
)
endef
+define gb_ExternalProject__use_revenge
+$(call gb_ExternalProject_use_package,$(1),librevenge)
+
+endef
+
endif # MSC
endif # SYSTEM_REVENGE
commit c5b76e3211552e979b948884cff8c3029cff0f05
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 25 13:39:03 2014 +0200
the other way around...
Change-Id: I6aeaa95079e37e710e5b8b1b8ce24464e11f45bb
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk
b/external/libodfgen/ExternalProject_libodfgen.mk
index 80cb2b0..ab430df 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--disable-werror \
--disable-weffc \
--without-docs \
- $(if $(VERBOSE)$(verbose),--enable-silent-rules) \
+ $(if
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
diff --git a/external/librevenge/ExternalProject_librevenge.mk
b/external/librevenge/ExternalProject_librevenge.mk
index e9a826c..1783993 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
--disable-streams \
--disable-generators \
--without-docs \
- $(if $(VERBOSE)$(verbose),--enable-silent-rules) \
+ $(if
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
