From 12954d12c34ade1043658a487352349482be81f3 Mon Sep 17 00:00:00 2001 From: "Brian J. Burg" Date: Thu, 25 Oct 2012 15:16:43 -0700 Subject: [PATCH] Fix linux build for recent submodule splits. --- mk/sub.mk | 12 +++++++++--- src/rust-azure | 2 +- src/rust-cairo | 2 +- src/rust-xlib | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mk/sub.mk b/mk/sub.mk index 16aaa24f4f9..cf4428ae615 100644 --- a/mk/sub.mk +++ b/mk/sub.mk @@ -73,14 +73,20 @@ endif ifeq ($(CFG_OSTYPE),linux) DEPS_rust-cairo += \ - rust-xlib + rust-freetype \ + rust-fontconfig \ + rust-xlib \ + $(NONE) DEPS_rust-azure += \ rust-freetype \ - rust-fontconfig + rust-fontconfig \ + rust-xlib \ + $(NONE) # See note at top of file DEPS_rust-layers += \ rust-freetype \ - rust-fontconfig + rust-fontconfig \ + $(NONE) endif diff --git a/src/rust-azure b/src/rust-azure index 6361edcf43a..bee8a610999 160000 --- a/src/rust-azure +++ b/src/rust-azure @@ -1 +1 @@ -Subproject commit 6361edcf43a0d791907b852ffd0cb55791d0c6a3 +Subproject commit bee8a6109996f02b0e1cfd5b643227543d83b0e8 diff --git a/src/rust-cairo b/src/rust-cairo index 84214a4b9e4..4140ff8db1e 160000 --- a/src/rust-cairo +++ b/src/rust-cairo @@ -1 +1 @@ -Subproject commit 84214a4b9e4e29403a8a744d4463ad9239294937 +Subproject commit 4140ff8db1e30765509cbabf6638f9eb2c7c1198 diff --git a/src/rust-xlib b/src/rust-xlib index 564266ba219..5fa62910d26 160000 --- a/src/rust-xlib +++ b/src/rust-xlib @@ -1 +1 @@ -Subproject commit 564266ba219295b38af6ed1fd869a9093a991f6f +Subproject commit 5fa62910d269d07afee5e3371b1a08a1b147dd70