diff --git a/recipes-libreoffice/libreoffice/files/0004-avoid-calling-cross-build-cppumaker.patch b/recipes-libreoffice/libreoffice/files/0004-avoid-calling-cross-build-cppumaker.patch deleted file mode 100644 index 2ca4ae6..0000000 --- a/recipes-libreoffice/libreoffice/files/0004-avoid-calling-cross-build-cppumaker.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 11294cf763dff2d9d23938c27f34aef88a813cb3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 9 Nov 2015 22:44:25 +0100 -Subject: [PATCH] avoid calling cross build 'cppumaker' -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Andreas Müller ---- - solenv/gbuild/UnoApiTarget.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk -index ca1fbf7..5a0a40a 100644 ---- a/solenv/gbuild/UnoApiTarget.mk -+++ b/solenv/gbuild/UnoApiTarget.mk -@@ -126,7 +126,7 @@ $(eval $(call gb_Output_error,gb_UnoApiHeadersTarget_select_variant must be defi - endif - - gb_UnoApiHeadersTarget_CPPUMAKERDEPS := $(call gb_Executable_get_runtime_dependencies,cppumaker) --gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(call gb_Executable_get_command,cppumaker) -+gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := cppumaker - - define gb_UnoApiHeadersTarget__command - $(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) \ --- -2.1.0 - diff --git a/recipes-libreoffice/libreoffice/files/0004-remove-paths-for-gb_Executable_get_command.patch b/recipes-libreoffice/libreoffice/files/0004-remove-paths-for-gb_Executable_get_command.patch new file mode 100644 index 0000000..225b41e --- /dev/null +++ b/recipes-libreoffice/libreoffice/files/0004-remove-paths-for-gb_Executable_get_command.patch @@ -0,0 +1,33 @@ +From 502ff5208fc4326960b9d1e9f25642046dc64a28 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 21 Nov 2015 23:56:19 +0100 +Subject: [PATCH] remove paths for gb_Executable_get_command +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +use binaries found in our native sysroot + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Andreas Müller +--- + solenv/gbuild/TargetLocations.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk +index 82857a9..0aa2cbd 100644 +--- a/solenv/gbuild/TargetLocations.mk ++++ b/solenv/gbuild/TargetLocations.mk +@@ -355,7 +355,7 @@ endef + # + # gb_Executable_get_command executable + define gb_Executable_get_command +-$(gb_Helper_set_ld_path) $(BUILDTOOLTRACE) $(2) $(call gb_Executable_get_target_for_build,$(1)) ++$(1) + endef + + define gb_Executable__get_workdir_linktargetname +-- +2.1.0 + diff --git a/recipes-libreoffice/libreoffice/files/0005-ensure-that-native-gendict-build-by-libreoffice-is-u.patch b/recipes-libreoffice/libreoffice/files/0005-ensure-that-native-gendict-build-by-libreoffice-is-u.patch new file mode 100644 index 0000000..0aae72f --- /dev/null +++ b/recipes-libreoffice/libreoffice/files/0005-ensure-that-native-gendict-build-by-libreoffice-is-u.patch @@ -0,0 +1,43 @@ +From 900b79ed77cd5c126cc4ac9beef488a94ef57b06 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 20 Nov 2015 22:03:58 +0100 +Subject: [PATCH] ensure that native gendict build by libreoffice is used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is neccessary since last commit using all helpers from native sysroot + +Upstream-Status: Inappropriate [oe specific] + +Change-Id: I0afbd760bc8810396e04a5e276a68a810042b057 +Signed-off-by: Andreas Müller +--- + i18npool/CustomTarget_breakiterator.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk +index 4aaf2e5..5837bc8 100644 +--- a/i18npool/CustomTarget_breakiterator.mk ++++ b/i18npool/CustomTarget_breakiterator.mk +@@ -22,7 +22,7 @@ $(i18npool_BIDIR)/dict_%.data : \ + | $(i18npool_BIDIR)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) + $(call gb_Helper_abbreviate_dirs,\ +- $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) ++ $(call gb_Helper_execute,gendict_libre) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) + else + + $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \ +@@ -34,7 +34,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \ + | $(i18npool_BIDIR)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) + $(call gb_Helper_abbreviate_dirs,\ +- $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) ++ $(call gb_Helper_execute,gendict_libre) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) + + endif + +-- +2.1.0 + diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index de5492f..63f604f 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -3,7 +3,8 @@ require ${BPN}.inc SRC_URI += " \ file://0002-configure.ac-skip-some-cross-compile-sections-they-d.patch \ file://0003-Makefile.in-avoid-building-target-cross-toolset.patch \ - file://0004-avoid-calling-cross-build-cppumaker.patch \ + file://0004-remove-paths-for-gb_Executable_get_command.patch \ + file://0005-ensure-that-native-gendict-build-by-libreoffice-is-u.patch \ " DEPENDS += " \ @@ -129,16 +130,6 @@ do_configure() { mkdir -p ${B}/workdir/Executable - # native binaries are expected in ${B}/workdir/LinkTarget/Executable - mkdir -p ${B}/workdir/LinkTarget/Executable - cd ${B}/workdir/LinkTarget/Executable - for name in ${LOBUILDTOOLS} ; do - ln -sf ${STAGING_BINDIR_NATIVE}/$name - done - - # see libreoffice-native do_install - ln -sf ${STAGING_BINDIR_NATIVE}/gendict_libre gendict - # icu binaries ar expected in our build tree mkdir -p ${B}/workdir/UnpackedTarball/icu/source/ cd ${B}/workdir/UnpackedTarball/icu/source/