bootstrap | 6 ++++--
solenv/bin/concat-deps.c | 2 ++
solenv/gbuild/platform/com_GCC_class.mk | 5 ++---
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit be5567d9e36ad40deb3e5c6ed219265cddc944c0
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Mar 5 20:50:56 2012 +0200
Revert "Workaround for weird gbuild looping problem with Clang for iOS"
The root cause for the problem was in solenv/bin/concat-deps.c, has
been fixed now.
This reverts commit af9618b29f186c3991d9225cc50b55dc78612f27.
diff --git a/solenv/gbuild/platform/com_GCC_class.mk
b/solenv/gbuild/platform/com_GCC_class.mk
index 78c1a7e..b8de73e 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -55,11 +55,10 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
-c $(3) \
-o $(1) \
- $(if $(filter IOS,$(OS)),,-MMD -MT $(1) \
- -MP -MF $(4)) \
+ -MMD -MT $(1) \
+ -MP -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
- $(if $(filter IOS,$(OS)),@echo $(1) : $(3) >$(4))
endef
define gb_SrsPartTarget__command_dep
commit 921902ead77b7111a84678898e92fbdaf9e6f496
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Mar 5 20:40:22 2012 +0200
Handle consecutive slashes before ".."
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index a667e0a..28ac2ed 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -692,6 +692,8 @@ static void _cancel_relative(char* base, char** ref_cursor,
char** ref_cursor_ou
do
{
cursor += 3;
+ while(cursor_out > base && cursor_out[-1] == '/')
+ cursor_out--;
while(cursor_out > base && *--cursor_out != '/');
}
while(cursor + 3 < end && !memcmp(cursor, "/../", 4));
commit 94d553b2fbff217861f150ba0583ea1dca35b30e
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Mar 5 20:38:29 2012 +0200
Must properly quote also the vars in config_build.mk when sourcing it
diff --git a/bootstrap b/bootstrap
index 313c2a9..3d1bc88 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,10 +2,12 @@
if test -z "${SRC_ROOT}"; then
if test -f ./config_build.mk ; then
- . ./config_build.mk
+ sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' <config_build.mk
>config_build.mk.sh
+ . ./config_build.mk.sh
+ rm config_build.mk.sh
else
if test -f ./config_host.mk ; then
- sed -e 's/^\(export .*=\)\(.*\)$/\1"\2"/' <config_host.mk
>config_host.mk.sh
+ sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' <config_host.mk
>config_host.mk.sh
. ./config_host.mk.sh
rm config_host.mk.sh
fi
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
