Merge branch 'master' into git

.gitignore

@@ -7,4 +7,5 @@ stage.sig
 stage.tar
 stage.tar.gz
 stage.toml
+sysroot
 xargo

cook.sh

@@ -95,6 +95,21 @@ function op {
             fi
             ;;
         prepare)
+	    rm -rf sysroot
+	    mkdir sysroot
+
+            if [ ${#BUILD_DEPENDS} -gt 0 ]
+            then
+                pushd $ROOT
+	            ./repo.sh ${BUILD_DEPENDS}
+	        popd
+
+                for i in "${BUILD_DEPENDS[@]}"
+		do
+                    CC=cc cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- --target=$TARGET install --root sysroot "$REPO/$i.tar.gz"
+                done
+            fi
+
             rm -rf build
             cp -r source build
 
@@ -105,6 +120,7 @@ function op {
             ;;
         unprepare)
             rm -rf build
+	    rm -rf sysroot
             ;;
         version)
             pushd build > /dev/null

pkgutils @ 96a6b2d9

-Subproject commit c7a89531e1a788a8e5a96f12c8949f9a2a8e9bdb
+Subproject commit 96a6b2d9fe30d054ef754e6cc3bf88ff60e40199

recipes/cargo/recipe.sh

 GIT=https://github.com/ids1024/cargo.git
 BRANCH=redox
+BUILD_DEPENDS=(openssl)
 
 function recipe_build {
-    if [ -d openssl-redox ]
-    then
-        git -C openssl-redox pull
-    else
-        git clone https://github.com/ids1024/openssl.git -b redox --depth 1 openssl-redox
-    fi
-
-    rm -rf openssl-prefix
-    mkdir openssl-prefix
-
-    pushd openssl-redox
-        ./Configure no-shared no-dgram redox-x86_64 --prefix="/"
-	make -j"$(nproc)"
-	make DESTDIR="$PWD/../openssl-prefix" install
-    popd
-
-    export OPENSSL_DIR=$PWD/openssl-prefix
+    export OPENSSL_DIR="$PWD/../sysroot"
 }

recipes/curl/recipe.sh

 GIT=https://github.com/ids1024/curl.git
 BRANCH=redox
+BUILD_DEPENDS=(openssl)
 
 HOST=x86_64-elf-redox
 
@@ -14,27 +15,8 @@ function recipe_update {
 }
 
 function recipe_build {
-    if [ -d openssl-redox ]
-    then
-        git -C openssl-redox pull
-    else
-        git clone https://github.com/ids1024/openssl.git -b redox --depth 1 openssl-redox
-    fi
-
-    rm -rf openssl-prefix
-    mkdir openssl-prefix
-
-    pushd openssl-redox
-        ./Configure no-shared no-dgram redox-x86_64 --prefix="/"
-	make -j"$(nproc)"
-	make DESTDIR="$PWD/../openssl-prefix" install
-    popd
-
-    rm -rf openssl-prefix/lib/pkgconfig # pkg-config returns paths based on / prefix, breaking cross compile
-
-    ./configure --prefix=/ --host=${HOST} --disable-tftp --disable-ftp --disable-ntlm-wb --with-ssl="$PWD/openssl-prefix" --with-ca-path=/ssl/certs
+    ./configure --prefix=/ --host=${HOST} --disable-tftp --disable-ftp --disable-ntlm-wb --with-ssl="$PWD/../sysroot" --with-ca-path=/ssl/certs
     make
-
     skip=1
 }
 

recipes/dash/recipe.sh

@@ -44,7 +44,6 @@ function recipe_clean {
 function recipe_stage {
     dest="$(realpath $1)"
     make DESTDIR="$dest" install
-    echo -e '#!/bin/ion\ndash @args[1..]' > "$1/bin/sh"
-    chmod a+x "$1/bin/sh"
+    ln -s "dash" "$1/bin/sh"
     skip=1
 }

recipes/gcc/recipe.sh

@@ -53,7 +53,6 @@ function recipe_stage {
     dest="$(realpath $1)"
     make DESTDIR="$dest" install-gcc install-target-libgcc
     find "$dest"/{bin,libexec} -exec x86_64-elf-redox-strip {} ';' 2> /dev/null
-    echo -e '#!/bin/ion\ngcc @args[1..]' > "$1/bin/cc"
-    chmod a+x "$1/bin/cc"
+    ln -s "gcc" "$1/bin/cc"
     skip=1
 }

recipes/openssl/recipe.sh

+GIT=https://github.com/ids1024/openssl.git
+BRANCH=redox
+
+HOST=x86_64-elf-redox
+
+function recipe_version {
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    skip=1
+}
+
+function recipe_update {
+    echo "skipping update"
+    skip=1
+}
+
+function recipe_build {
+    ./Configure no-shared no-dgram redox-x86_64 --prefix="/"
+    make -j"$(nproc)"
+    skip=1
+}
+
+function recipe_test {
+    echo "skipping test"
+    skip=1
+}
+
+function recipe_clean {
+    make clean
+    skip=1
+}
+
+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
+}