diff --git a/bin/x86_64-unknown-redox-pkg-config b/bin/x86_64-unknown-redox-pkg-config index db91a59aed16f3fab4c5f6e4a13cc521965f8f89..7693e6210839433611c17fcae95bde2082341700 100644 --- a/bin/x86_64-unknown-redox-pkg-config +++ b/bin/x86_64-unknown-redox-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PKG_CONFIG_DIR= +export PKG_CONFIG_PATH= export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_RECIPE}/sysroot" export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig" diff --git a/config.sh b/config.sh index 6e21f242d1e1f94cbc1e1d27b18524f8214d7f7f..da7b8902ee28d8ea72701f366bec061e4d3b6d14 100755 --- a/config.sh +++ b/config.sh @@ -20,7 +20,7 @@ export LD="${HOST}-ld" export NM="${HOST}-nm" export OBJCOPY="${HOST}-objcopy" export OBJDUMP="${HOST}-objdump" -export PKG_CONFIG="${HOST}-pkg-config" +#export PKG_CONFIG="${HOST}-pkg-config" export RANLIB="${HOST}-ranlib" export READELF="${HOST}-readelf" export STRIP="${HOST}-strip" diff --git a/cook.sh b/cook.sh index c99c2f7220327605236d04eb2a64e35e3584e91f..3de6157b3364839d5d032689327e5a078559bb62 100755 --- a/cook.sh +++ b/cook.sh @@ -423,6 +423,8 @@ then then export COOKBOOK_RECIPE="${ROOT}/recipes/$1" + + export PKG_CONFIG_ALLOW_CROSS=1 export PKG_CONFIG_PATH= export PKG_CONFIG_LIBDIR="${COOKBOOK_RECIPE}/sysroot/lib/pkgconfig" export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_RECIPE}/sysroot" diff --git a/recipes/extrautils/recipe.sh b/recipes/extrautils/recipe.sh index f36cbfcab50c3c32ca5256a624a6c2228bd2f58f..cef3940acac27099e1397669178efe04f9b6f08e 100644 --- a/recipes/extrautils/recipe.sh +++ b/recipes/extrautils/recipe.sh @@ -1,6 +1,2 @@ GIT=https://github.com/redox-os/extrautils.git BUILD_DEPENDS=(xz) -export PKG_CONFIG_ALLOW_CROSS=1 -export PKG_CONFIG_PATH= -export PKG_CONFIG_LIBDIR="$PWD/sysroot/lib/pkgconfig" -export PKG_CONFIG_SYSROOT_DIR="$PWD/sysroot"