[WIP] Rest of stuff (may not be actually needed)

Each of these must be investigated and seen if it is really needed.
hashdist · Feb 23, 2015 · a22f87c · a22f87c
1 parent 3773d9f
commit a22f87c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/pkgs/cairo.yaml b/pkgs/cairo.yaml
@@ -4,13 +4,17 @@ defaults:
   relocatable: false
 
 dependencies:
-  build: [python, pkg-config, png, pixman, fontconfig, freetype, zlib]
+  build: [python, glib2, pkg-config, png, pixman, fontconfig, freetype, zlib]
   run: [pkg-config]
 
 sources:
 - key: tar.xz:ft27qfbs457kinm27honb5h26n6qcwju
   url: http://cairographics.org/releases/cairo-1.14.0.tar.xz
 
+build_stages:
+- name: configure
+  global_flags: true
+
 when_build_dependency:
 - prepend_path: PKG_CONFIG_PATH
   value: '${ARTIFACT}/lib/pkgconfig'

diff --git a/pkgs/glib2.yaml b/pkgs/glib2.yaml
@@ -7,6 +7,10 @@ dependencies:
 defaults:
   relocatable: false
 
+build_stages:
+- name: configure
+  global_flags: true
+
 sources:
 - key: tar.xz:r47qqzjibzc3rtuebylw56b3z7krcfej
   url: http://ftp.gnome.org/pub/gnome/sources/glib/2.42/glib-2.42.1.tar.xz

diff --git a/pkgs/pango.yaml b/pkgs/pango.yaml
@@ -14,7 +14,8 @@ sources:
 
 build_stages:
 - name: configure
-  extra: ['CAIRO_CFLAGS=-I${CAIRO_DIR}/include/cairo']
+  extra: ['CAIRO_CFLAGS=-I${CAIRO_DIR}/include/cairo -I${GLIB2_DIR}/include/glib-2.0']
+  global_flags: true
 
 when_build_dependency:
 - prepend_path: PKG_CONFIG_PATH