From 296d0c7b34f065271fb6856752d471dfa8416cee Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sat, 10 Aug 2019 18:37:25 -0600
Subject: [PATCH] Use pkg-config for cairodemo
---
recipes/cairodemo/recipe.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/cairodemo/recipe.sh b/recipes/cairodemo/recipe.sh
index 5326f6f36..f35d2c20f 100755
--- a/recipes/cairodemo/recipe.sh
+++ b/recipes/cairodemo/recipe.sh
@@ -1,4 +1,4 @@
-BUILD_DEPENDS=(liborbital cairo pixman zlib libpng freetype)
+BUILD_DEPENDS=(cairo expat fontconfig freetype liborbital libpng pixman zlib)
function recipe_version {
printf "1.0.0"
@@ -21,7 +21,7 @@ function recipe_build {
export LDFLAGS="-L$sysroot/lib"
export CPPFLAGS="-I$sysroot/include"
set -x
- "${CXX}" -I "$sysroot/include" -L "$sysroot/lib" cairodemo.c -o cairodemo -static -lorbital -lcairo -lpixman-1 -lfreetype -lpng -lz
+ "${CXX}" $("${PKG_CONFIG}" --cflags cairo) cairodemo.c -o cairodemo -static $("${PKG_CONFIG}" --libs cairo) -lorbital
set +x
skip=1
}
--
GitLab