[Libreoffice-commits] .: 7 commits - Module_cross_tail_build.mk redland/ExternalPackage_raptor.mk redland/ExternalPackage_rasqal.mk redland/ExternalPackage_redland.mk redland/ExternalProject_raptor.mk redland/ExternalProject_rasqal.mk redland/ExternalProject_redland.mk solenv/gbuild
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 30 15:11:03 PST 2012
Module_cross_tail_build.mk | 1 -
redland/ExternalPackage_raptor.mk | 2 +-
redland/ExternalPackage_rasqal.mk | 2 +-
redland/ExternalPackage_redland.mk | 2 +-
redland/ExternalProject_raptor.mk | 6 ++++--
redland/ExternalProject_rasqal.mk | 5 +++--
redland/ExternalProject_redland.mk | 5 +++--
solenv/gbuild/Package.mk | 2 +-
solenv/gbuild/TargetLocations.mk | 7 ++++++-
9 files changed, 20 insertions(+), 12 deletions(-)
New commits:
commit afb9d7d84cb25d91335467dd5e121f353e37a3ff
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Dec 31 01:10:36 2012 +0200
Fix misleading indentation
Change-Id: I72050f4d3b0f617e04a8b404ecdc99e5e2806f18
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index 084b0be..5007046 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
--without-postgresql --without-threestone --with-regex-library=posix \
--with-decimal=none --with-www=xml \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)\
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)\
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
&& $(GNUMAKE) \
&& touch $@
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index e9e90d7..79ed772 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
--without-threestone --with-regex-library=posix --with-decimal=none \
--with-www=xml \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
$(if $(filter-out ANDROID,$(OS)),--with-threads) \
&& cd librdf \
commit d9584d9a6b017ee8b6f95a14fdec1223eb7dab6b
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Dec 31 01:01:57 2012 +0200
Fix redland cross-compilation at least for Android
Fix typo: It's SYSTEM_LIBXML, not SYSTEM_LIBXML2.
The xml2-config from our patched bundled libxml2 needs LIBXML2LIB.
Need to find raptor-config and rasqal-config (for the HOST platform, that's
fine as they are shell scripts. not binaries) in PATH.
Change-Id: I58376d4ffbc9954c375b4e2b9bad3f68ed12e3bf
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index 69650c7..1571821 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
cd $(EXTERNAL_WORKDIR) \
&& CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
- LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML2)),$(LIBXML_LIBS),-lxml2)" \
+ LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
./configure --disable-static --enable-shared --disable-gtk-doc --with-openssl-digests \
@@ -50,7 +50,9 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)\
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
$(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \
- $(if $(filter NO,$(SYSTEM_LIBXML2)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \
+ $(if $(filter NO,$(SYSTEM_LIBXML)), \
+ LIBXML2LIB=-lxml2 \
+ --with-xml2-config=$(OUTDIR)/bin/xml2-config) \
&& $(GNUMAKE) \
&& touch $@
endif
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index 99ee3b8..084b0be 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
cd $(EXTERNAL_WORKDIR) \
&& CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
- LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML2)),$(LIBXML_LIBS),-lxml2)" \
+ LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
./configure --disable-static --enable-shared --disable-gtk-doc --with-openssl-digests \
@@ -37,6 +37,7 @@ else
$(call gb_ExternalProject_get_state_target,rasqal,build):
cd $(EXTERNAL_WORKDIR) \
&& CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
+ PATH="$(OUTDIR)/bin:$$PATH" \
LDFLAGS="-L$(OUTDIR)/lib \
$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl$(COMMA)-noinhibit-exec) \
$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 62cf9d5..e9e90d7 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
cd $(EXTERNAL_WORKDIR) \
&& CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--export-all-symbols $(subst ;, -L,$(ILIB))" \
- LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML2)),$(LIBXML_LIBS),-lxml2)" \
+ LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
./configure --disable-static --disable-gtk-doc --with-openssl-digests \
@@ -36,6 +36,7 @@ else
$(call gb_ExternalProject_get_state_target,redland,build):
cd $(EXTERNAL_WORKDIR) \
&& CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
+ PATH="$(OUTDIR)/bin:$$PATH" \
LDFLAGS="-L$(OUTDIR)/lib \
$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl$(COMMA)-noinhibit-exec) \
$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
commit 0876c627ddada2855e92203859b815a5f35262c8
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Dec 31 00:50:31 2012 +0200
Fix typo s/ANDRIOD/ANDROID/
Change-Id: Ib3ebaf542bc74ce8c8d5cd967d3e55217b62381e
diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk
index 414b9c8..18e8fd4 100644
--- a/redland/ExternalPackage_raptor.mk
+++ b/redland/ExternalPackage_raptor.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,raptor,bin/raptor-config,src/raptor-co
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor-lo.1.dylib,src/.libs/libraptor-lo.1.dylib))
$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.dylib,src/.libs/libraptor-lo.1.dylib))
-else ifneq ($(filter IOS ANDRIOD,$(OS)),)
+else ifneq ($(filter IOS ANDROID,$(OS)),)
$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.a,src/.libs/libraptor.a))
else ifneq ($(filter WNT,$(OS)),)
$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.a,src/.libs/libraptor.a))
diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk
index 88c48c6..41576ae 100644
--- a/redland/ExternalPackage_rasqal.mk
+++ b/redland/ExternalPackage_rasqal.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,rasqal,bin/rasqal-config,src/rasqal-co
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.1.dylib,src/.libs/librasqal-lo.1.dylib))
$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dylib,src/.libs/librasqal-lo.1.dylib))
-else ifneq ($(filter IOS ANDRIOD,$(OS)),)
+else ifneq ($(filter IOS ANDROID,$(OS)),)
$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a))
else ifneq ($(filter WNT,$(OS)),)
$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a))
diff --git a/redland/ExternalPackage_redland.mk b/redland/ExternalPackage_redland.mk
index 10eaecd..a0c8a73 100644
--- a/redland/ExternalPackage_redland.mk
+++ b/redland/ExternalPackage_redland.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,redland,redland))
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.0.dylib,librdf/.libs/librdf-lo.0.dylib))
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dylib,librdf/.libs/librdf-lo.0.dylib))
-else ifneq ($(filter IOS ANDRIOD,$(OS)),)
+else ifneq ($(filter IOS ANDROID,$(OS)),)
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,librdf/.libs/librdf.a))
else ifneq ($(filter WNT,$(OS)),)
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,librdf/.libs/librdf.a))
commit 960dd22f2b2753d2f066af3c4caa09665208e89c
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Dec 31 01:07:38 2012 +0200
gb_Executable_get_runtime_dependencies should be empty when cross-compiling
Change-Id: I3d8a454a6c3e2ccf5661742d26c85224bb4773bd
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index fe68e0c98..428af86 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -349,9 +349,14 @@ endef
# ExternalExecutable.
#
# gb_Executable_get_runtime_dependencies executable
+ifeq ($(CROSS_COMPILING),YES)
+define gb_Executable_get_runtime_dependencies
+endef
+else
define gb_Executable_get_runtime_dependencies
$(call gb_Executable_get_runtime_target,$(1))
endef
+endif
define gb_Executable__get_command
$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call gb_Output_error,executable group NONE does not exist!))
commit fca6f2eba2119ee90fc4276390315e2832478b42
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Dec 31 00:15:23 2012 +0200
Avoid Emacs warning "suspicious line"
Change-Id: Icb8f4adb0794bd2857c48dbc6756b3258b8bbefd
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 2292faa..93c0b90 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -58,7 +58,7 @@ $(call gb_Package_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PKG,2)
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
&& cat $${RESPONSEFILE} | xargs $(if $(filter MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -f \
- && rm -f $${RESPONSEFILE}
+ && rm -f $${RESPONSEFILE}
$(call gb_Package_get_preparation_target,%) :
mkdir -p $(dir $@) && touch $@
commit 0599c27c37f37a066edb1f8cefd70f83a58bf33f
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Dec 31 00:10:18 2012 +0200
Remove misleading indentation
The indented line is not part of the if function on the line above.
Change-Id: I7ae7c1223af74cc5ffcf9d1d32fb848212859ac9
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 539c0aa..fe68e0c98 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -356,7 +356,7 @@ endef
define gb_Executable__get_command
$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call gb_Output_error,executable group NONE does not exist!))
$(if $(filter $(1),$(gb_Executable_NONE)),,$(gb_Helper_set_ld_path)) \
- $(call gb_Executable_get_target_for_build,$(1))
+$(call gb_Executable_get_target_for_build,$(1))
endef
# Get complete command-line for running the executable
commit a709e8d9d8e8b625a1f1694906057a2f6696dade
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Dec 30 21:08:45 2012 +0200
Revert "fix redland for android"
I don't see how this would help at all?
This reverts commit ecc9896c9be9669ec1ea13a99c9aa624356b07aa.
Change-Id: Ibac7faa17ca3e6d1ba4426c270428327cc90d5ee
diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 7ad474b..2e15516 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
officecfg \
oovbaapi \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
- $(call gb_Helper_optional,REDLAND,redland) \
registry \
remotebridges \
ridljar \
More information about the Libreoffice-commits
mailing list