Makefile.top | 2 +-
glib/prj/build.lst | 2 +-
solenv/bin/concat-deps.c | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit cd923cfccb9a784349d4097d4e67d68ee176a899
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Aug 8 00:05:35 2012 +0200
glib: missing zlib dependency
Change-Id: Ic57dc1843e11c08553656e798e7601d4d8607942
diff --git a/glib/prj/build.lst b/glib/prj/build.lst
index 4ce8075..8a8aa32 100644
--- a/glib/prj/build.lst
+++ b/glib/prj/build.lst
@@ -1,3 +1,3 @@
-gl glib : gettext NULL
+gl glib : gettext ZLIB:zlib NULL
gl glib usr1 - all gl_mkout NULL
gl glib nmake - all gl_glib NULL
commit 15f0f96da43c177fb40bc4a54062b35eb365d6e9
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Aug 8 00:03:21 2012 +0200
concat-deps: those silly drive letters indicate absolute paths
Change-Id: If1d43f8f5e61f52c554bcdcf7f86639f1ea60046
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index e68093b..4c2aaf4 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -720,7 +720,8 @@ char* token;
token = strtok(line," ");
while(token != NULL)
{
- if(*token == ':' || *token == '\\' || *token == '/' || *token == '$')
+ if(*token == ':' || *token == '\\' || *token == '/' || *token == '$'
+ || ':' == token[1])
{
fputs(token, stdout);
}
commit 6d192bc688ae4acdfb9b18c6ead156f629c9d1b2
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Aug 8 00:03:00 2012 +0200
make bootstrap: add dependency on concat-deps.c
Change-Id: I39dcb1e4d6493b01b68055d006f658af0b6e67ef
diff --git a/Makefile.top b/Makefile.top
index b10643b..4361777 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -375,7 +375,7 @@ endif
#
bootstrap: $(WORKDIR)/bootstrap
-$(WORKDIR)/bootstrap:
+$(WORKDIR)/bootstrap: solenv/bin/concat-deps.c
@cd $(SRCDIR) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
