Fix pkg-config with autotools programs

2026-06-22 04:44:19 +08:00 · 2018-02-22 20:07:00 -07:00 · 2018-02-22 20:07:00 -07:00 · f0f05be025
commit f0f05be025
parent 2ff556bce1
17 changed files with 32 additions and 148 deletions
--- a/config.sh
+++ b/config.sh
@ -9,8 +9,20 @@ HOST=$TARGET
 # Automatic variables
 ROOT="$(cd `dirname "$0"` && pwd)"
 REPO="$ROOT/repo/$TARGET"
-export CC="$HOST-gcc"
-export XARGO_HOME="$ROOT/xargo"
+export XARGO_HOME="${ROOT}/xargo"
+
+export AR="${HOST}-ar"
+export AS="${HOST}-as"
+export CC="${HOST}-gcc"
+export CXX="${HOST}-g++"
+export LD="${HOST}-ld"
+export NM="${HOST}-nm"
+export OBJCOPY="${HOST}-objcopy"
+export OBJDUMP="${HOST}-objdump"
+export PKG_CONFIG="${HOST}-pkg-config"
+export RANLIB="${HOST}-ranlib"
+export READELF="${HOST}-readelf"
+export STRIP="${HOST}-strip"

 if [[ "$OSTYPE" == "darwin"* ]]; then
    # GNU find
--- a/cook.sh
+++ b/cook.sh
@ -422,6 +422,16 @@ then
    if [ -d "$ROOT/recipes/$1" ]
    then
        cd "$ROOT/recipes/$1"
+
+        function x86_64-unknown-redox-pkg-config {
+            export PKG_CONFIG_PATH=
+            export PKG_CONFIG_DIR=
+            export PKG_CONFIG_LIBDIR="$PWD/sysroot/lib/pkgconfig"
+            export PKG_CONFIG_SYSROOT_DIR="$PWD/sysroot"
+
+            exec pkg-config "$@"
+        }
+
        source recipe.sh

        ops=()
--- a/recipes/cmatrix/recipe.sh
+++ b/recipes/cmatrix/recipe.sh
@ -2,18 +2,6 @@ GIT=https://github.com/abishekvashok/cmatrix
 BUILD_DEPENDS=(ncurses)
 DEPENDS=(terminfo)

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
    skip=1
@ -29,7 +17,7 @@ function recipe_build {
    export LDFLAGS="-L$sysroot/lib"
    export CPPFLAGS="-I$sysroot/include"
    ./configure --host=${HOST} --prefix=/ --without-fonts
-    make 
+    make
    skip=1
 }

--- a/recipes/curl/recipe.sh
+++ b/recipes/curl/recipe.sh
@ -34,6 +34,6 @@ function recipe_clean {
 function recipe_stage {
    dest="$(realpath $1)"
    make DESTDIR="$dest" install
-    rm -rf "$1"/{share,lib/pkgconfig}
+    rm -rf "$1"/share
    skip=1
 }
--- a/recipes/dash/recipe.sh
+++ b/recipes/dash/recipe.sh
@ -1,18 +1,6 @@
 GIT=https://github.com/redox-os/dash.git
 BRANCH=redox

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
    skip=1
--- a/recipes/gcc/recipe.sh
+++ b/recipes/gcc/recipe.sh
@ -2,18 +2,6 @@ GIT=https://github.com/redox-os/gcc.git
 BRANCH=redox
 DEPENDS="gnu-binutils newlib"

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
    skip=1
--- a/recipes/git/recipe.sh
+++ b/recipes/git/recipe.sh
@ -3,18 +3,6 @@ TAR=https://www.kernel.org/pub/software/scm/git/git-$VERSION.tar.xz
 BUILD_DEPENDS=(zlib curl openssl expat)
 DEPENDS="ca-certificates"

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 MAKEFLAGS="NO_MMAP=1 NEEDS_SSL_WITH_CURL=1 NEEDS_CRYPTO_WITH_SSL=1 NO_UNIX_SOCKETS=1 NEEDS_LIBICONV= NEEDS_LIBRT= BLK_SHA1=1"

 function recipe_version {
--- a/recipes/gnu-binutils/recipe.sh
+++ b/recipes/gnu-binutils/recipe.sh
@ -1,17 +1,5 @@
 GIT=https://github.com/redox-os/binutils-gdb.git

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
    skip=1
--- a/recipes/gnu-make/recipe.sh
+++ b/recipes/gnu-make/recipe.sh
@ -1,18 +1,6 @@
 VERSION=4.2.1
 TAR=https://ftp.gnu.org/gnu/make/make-$VERSION.tar.gz

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
    echo "$VERSION"
    skip=1
--- a/recipes/jansson/recipe.sh
+++ b/recipes/jansson/recipe.sh
@ -1,18 +1,6 @@
 VERSION=2.10
 TAR=http://www.digip.org/jansson/releases/jansson-$VERSION.tar.gz

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
    echo "$VERSION"
    skip=1
@ -27,7 +15,7 @@ function recipe_build {
    sysroot="${PWD}/../sysroot"
    export LDFLAGS="-L$sysroot/lib"
    export CPPFLAGS="-I$sysroot/include"
-    ./configure --host=${HOST} --prefix=/ 
+    ./configure --host=${HOST} --prefix=/
    make 
    skip=1
 }
--- a/recipes/mdp/recipe.sh
+++ b/recipes/mdp/recipe.sh
@ -14,8 +14,6 @@ function recipe_update {

 function recipe_build {
    sysroot="${PWD}/../sysroot"
-    export CC="${HOST}-gcc"
-    export LD="${HOST}-ld"
    export CFLAGS="-I$sysroot/include -I$sysroot/include/ncursesw"
    export LDFLAGS="-L$sysroot/lib"

--- a/recipes/netsurf/recipe.sh
+++ b/recipes/netsurf/recipe.sh
@ -2,19 +2,6 @@ VERSION=3.7
 TAR=http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$VERSION.tar.gz
 BUILD_DEPENDS=(expat curl sdl openssl zlib)

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
-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"
@ -31,11 +18,11 @@ function recipe_update {

 function recipe_build {
    sysroot="${PWD}/../sysroot"
-    export CFLAGS="-I$sysroot/include"
-    export LDFLAGS="-L$sysroot/lib"
    export TARGET="framebuffer"
+    export CFLAGS="-I$sysroot/include -I${PWD}/inst-${TARGET}/include"
+    export LDFLAGS="-L$sysroot/lib -L${PWD}/inst-${TARGET}/lib"

-    make
+    make V=1
    skip=1
 }

--- a/recipes/newlibtest/recipe.sh
+++ b/recipes/newlibtest/recipe.sh
@ -13,8 +13,6 @@ function recipe_update {

 function recipe_build {
    sysroot="${PWD}/../sysroot"
-    export CC="${HOST}-gcc"
-    export LD="${HOST}-ld"
    export CFLAGS="-static -nostdinc -I $sysroot/include -I /usr/lib/gcc/x86_64-unknown-redox/7.0.1/include/ -nostdlib -L $sysroot/lib"
    export CRT="$sysroot/lib/crt0.o"
    export CLIBS="-lc -lm"
--- a/recipes/openssl/recipe.sh
+++ b/recipes/openssl/recipe.sh
@ -30,7 +30,6 @@ function recipe_clean {
 function recipe_stage {
    dest="$(realpath $1)"
    make DESTDIR="$dest" install
-    rm -rf "$1/lib/pkgconfig" # pkg-config returns paths based on / prefix, breaking cross compile
    rm -rf "$1/{share,ssl}"
    skip=1
 }
--- a/recipes/python/recipe.sh
+++ b/recipes/python/recipe.sh
@ -1,18 +1,6 @@
 VERSION=3.6.2
 TAR=https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tar.xz

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 export CONFIG_SITE=config.site

 function recipe_version {
--- a/recipes/ssh/recipe.sh
+++ b/recipes/ssh/recipe.sh
@ -2,18 +2,6 @@ VERSION=7.6p1
 TAR=http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$VERSION.tar.gz
 BUILD_DEPENDS=(zlib openssl)

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-gcc"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
    echo "$VERSION"
    skip=1
@ -53,12 +41,12 @@ function newlib_build {
 }

 function recipe_build {
-    newlib_build 
+    newlib_build
    sysroot="${PWD}/../sysroot"
    export LDFLAGS="-L$sysroot/lib"
    export CPPFLAGS="-I$sysroot/include"
    ./configure --host=${HOST} --prefix=/
-    make 
+    make
    skip=1
 }

--- a/recipes/vim/recipe.sh
+++ b/recipes/vim/recipe.sh
@ -3,18 +3,6 @@ TAR=http://ftp.vim.org/vim/unix/vim-$VERSION.tar.bz2
 BUILD_DEPENDS=(ncurses)
 DEPENDS="terminfo"

-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
    echo "$VERSION"
    skip=1