redland/ExternalProject_raptor.mk | 2 +-
redland/ExternalProject_rasqal.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a0509900b65f72e9db60eeb660f0586cd5fa775c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jan 31 10:43:18 2013 +0100
Proper spacing in makefile command line continuations
Quoting "The Open Group Base Specifications Issue 7" at
<http://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html#tag_20_76_13_01>
"Extended Description: Makefile Syntax:" "When an escaped <newline> is
found in
a command line in a makefile, the command line shall contain the
<backslash>,
the <newline>, and the next line, except that the first character of the
next
line shall not be included if it is a <tab>."
On Mac OS X, this caused raptor and rasqal to erroneously be configured
with a
--prefix argument that ended in "--disable-static".
Change-Id: I9455f8e2e624b245a5278a21d8b0f62d8780f9e4
diff --git a/redland/ExternalProject_raptor.mk
b/redland/ExternalProject_raptor.mk
index baf0873..4dae07e 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,raptor,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
NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \
$(if $(filter NO,$(SYSTEM_LIBXML)), \
diff --git a/redland/ExternalProject_rasqal.mk
b/redland/ExternalProject_rasqal.mk
index d52ef3a..0dfcb14 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) \
&& $(MAKE) \
&& touch $@
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
