From a15946a32469079477d798f7d17186c4499bc764 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <ian@iandouglasscott.com>
Date: Thu, 6 Jul 2017 14:24:19 -0700
Subject: [PATCH] System for compile-time dependencies; use for openssl
---
cook.sh | 16 ++++++++++++++++
recipes/cargo/recipe.sh | 19 ++-----------------
recipes/curl/recipe.sh | 22 ++--------------------
recipes/openssl/recipe.sh | 38 ++++++++++++++++++++++++++++++++++++++
4 files changed, 58 insertions(+), 37 deletions(-)
create mode 100644 recipes/openssl/recipe.sh
diff --git a/cook.sh b/cook.sh
index 9d11a95b9..4a9ab7831 100755
--- a/cook.sh
+++ b/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
diff --git a/recipes/cargo/recipe.sh b/recipes/cargo/recipe.sh
index 835267931..dad63c3bc 100644
--- a/recipes/cargo/recipe.sh
+++ b/recipes/cargo/recipe.sh
@@ -1,22 +1,7 @@
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"
}
diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh
index ad96990c2..80ef01b77 100644
--- a/recipes/curl/recipe.sh
+++ b/recipes/curl/recipe.sh
@@ -1,5 +1,6 @@
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
}
diff --git a/recipes/openssl/recipe.sh b/recipes/openssl/recipe.sh
new file mode 100644
index 000000000..48559cac7
--- /dev/null
+++ b/recipes/openssl/recipe.sh
@@ -0,0 +1,38 @@
+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
+}
--
GitLab