Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Switch to the in-tree cairo build

  • Loading branch information...
commit 9b6e305014b0e483a16963fdf3da2bfc28887762 1 parent 9a3ac59
@brson brson authored
Showing with 13 additions and 6 deletions.
  1. +4 −0 configure
  2. +7 −4 mk/sub.mk
  3. +1 −1  src/rust-azure
  4. +1 −1  src/rust-cairo
View
4 configure
@@ -440,6 +440,10 @@ fi
export pixman_CFLAGS="-I${CFG_SRC_DIR}src/pixman/pixman -I${CFG_BUILD_DIR}src/pixman/pixman"
export pixman_LDFLAGS="-I${CFG_BUILD_DIR}src/pixman/pixman/.libs"
+# PIC all the things
+export CFLAGS="${CFLAGS} -fPIC"
+export LDFLAGS="${CFLAGS} -fPIC"
+
for i in ${CFG_SUBMODULES}
do
if [ -d ${CFG_BUILD_DIR}src/${i} ]
View
11 mk/sub.mk
@@ -33,6 +33,10 @@ NATIVE_BUILDS += \
# NB. This should not be a problem once a real package system exists.
+DEPS_rust-cairo += \
+ cairo \
+ $(NULL)
+
DEPS_rust-azure += \
rust-geom \
rust-cairo \
@@ -95,10 +99,9 @@ DEPS_libcss += \
libparserutils \
$(NULL)
-ENV_EXTRA_FLAGS_cairo += \
- pixman_CFLAGS="-I$(B)src/pixman/pixman" \
- pixman_LDFLAGS="-L$(B)src/pixman/pixman/.libs" \
- $(NULL)
+DONE_pixman = "$(B)src/pixman/pixman/.libs/libpixman-1.a"
+
+DONE_cairo = "$(B)src/cairo/src/.libs/libcairo.a"
DEPS_cairo += \
pixman \
2  src/rust-azure
@@ -1 +1 @@
-Subproject commit b2b53908ca67f7c74c067ec0d601776c180db09f
+Subproject commit df7e8c3e23a1b2ae9ac5b8c6c83d3e801f6dde5c
2  src/rust-cairo
@@ -1 +1 @@
-Subproject commit fda83465dfb30e4724eac1f560e0e4b2d82a6783
+Subproject commit 8f4dd57c299e96461736be1874d03e14eb8ca1d9
Please sign in to comment.
Something went wrong with that request. Please try again.