Merge branch 'fix-meson-flags' into 'master'

Include flags to meson cross file

See merge request redox-os/cookbook!599

recipes/libs/cairo/recipe.toml

@@ -28,9 +28,8 @@ script = """
 DYNAMIC_INIT
 #TODO: fix mutex implementation
 #TODO: why are math defines missing?
-#TODO: why is -lexpat not automatic?
+CFLAGS="${CFLAGS} -DCAIRO_NO_MUTEX=1 -DM_SQRT2=1.41421356237309504880 -DM_LN2=0.69314718055994530942"
 cookbook_meson \
-    -Dc_args="-DCAIRO_NO_MUTEX=1 -DM_SQRT2=1.41421356237309504880 -DM_LN2=0.69314718055994530942 -lexpat" \
     -Dxlib-xcb=enabled \
     -Dtests=disabled
 """

recipes/libs/gstreamer/recipe.toml

@@ -62,8 +62,8 @@ DYNAMIC_INIT
 export GLIB_GENMARSHAL="$(which glib-genmarshal)"
 export GLIB_MKENUMS="$(which glib-mkenums)"
 
+CFLAGS="${CFLAGS} -DM_LN2=0.69314718055994530942"
 cookbook_meson \
-    -Dc_args="-DM_LN2=0.69314718055994530942" \
     -Ddevtools=disabled \
     -Dexamples=disabled \
     -Dlibav=disabled \

recipes/libs/mesa/recipe.toml

@@ -13,8 +13,8 @@ dependencies = [
 script = """
 DYNAMIC_INIT
 
-export CFLAGS+="-I${COOKBOOK_SYSROOT}/include -DHAVE_PTHREAD=1"
-export CPPFLAGS+="-I${COOKBOOK_SYSROOT}/include -DHAVE_PTHREAD=1"
+export CFLAGS+=" -DHAVE_PTHREAD=1"
+export CPPFLAGS+=" -DHAVE_PTHREAD=1"
 export LLVM_CONFIG="${TARGET}-llvm-config"
 
 if [[ -n "${COOKBOOK_PREFER_STATIC}" ]]; then

recipes/libs/pango/recipe.toml

@@ -33,9 +33,7 @@ dependencies = [
 template = "custom"
 script = """
 DYNAMIC_INIT
-#TODO: why are these libs not automatic?
 cookbook_meson \
-    -Dc_args="-lfontconfig -lexpat -lpixman-1 -lpng -lz -lcairo" \
     -Dbuild-examples=false \
     -Dbuild-testsuite=false
 """

recipes/wip/libs/gtk/gtk3/recipe.toml

@@ -43,9 +43,8 @@ dependencies = [
 template = "custom"
 script = """
 DYNAMIC_INIT
-#TODO: why are libs not automatically detected?
+CFLAGS="${CFLAGS} -DM_SQRT2=1.41421356237309504880"
 cookbook_meson \
-    -Dc_args="-DM_SQRT2=1.41421356237309504880 -lXext -lX11 -lxcb -lXau" \
     -Dintrospection=false \
     -Dwayland_backend=false
 """

src/bin/cook.rs

@@ -965,6 +965,9 @@ function cookbook_meson {
     echo "[properties]" >> cross_file.txt
     echo "needs_exe_wrapper = true" >> cross_file.txt
     echo "sys_root = '${COOKBOOK_SYSROOT}'" >> cross_file.txt
+    echo "c_args = [$(printf "'%s', " $CFLAGS | sed 's/, $//')]" >> cross_file.txt
+    echo "cpp_args = [$(printf "'%s', " $CPPFLAGS | sed 's/, $//')]" >> cross_file.txt
+    echo "c_link_args = [$(printf "'%s', " $LDFLAGS | sed 's/, $//')]" >> cross_file.txt
 
     unset AR
     unset AS