From f666977dc514982b2a73c5edc75c95fdf725c378 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <ian@iandouglasscott.com>
Date: Fri, 7 Jul 2017 12:55:07 -0700
Subject: [PATCH] Use curl in git
---
recipes/curl/recipe.sh | 5 +++--
recipes/expat/recipe.sh | 37 +++++++++++++++++++++++++++++++++++++
recipes/git/recipe.sh | 9 ++++++---
3 files changed, 46 insertions(+), 5 deletions(-)
create mode 100644 recipes/expat/recipe.sh
diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh
index 80ef01b77..e3ec67887 100644
--- a/recipes/curl/recipe.sh
+++ b/recipes/curl/recipe.sh
@@ -31,7 +31,8 @@ function recipe_clean {
}
function recipe_stage {
- mkdir "$1/bin"
- cp src/curl "$1/bin"
+ dest="$(realpath $1)"
+ make DESTDIR="$dest" install
+ rm -rf "$1"/{share,lib/pkgconfig}
skip=1
}
diff --git a/recipes/expat/recipe.sh b/recipes/expat/recipe.sh
new file mode 100644
index 000000000..672180052
--- /dev/null
+++ b/recipes/expat/recipe.sh
@@ -0,0 +1,37 @@
+VERSION=2.2.1
+TAR=http://downloads.sourceforge.net/project/expat/expat/$VERSION/expat-$VERSION.tar.bz2
+
+HOST=x86_64-elf-redox
+
+function recipe_version {
+ echo "$VERSION"
+ skip=1
+}
+
+function recipe_update {
+ echo "skipping update"
+ skip=1
+}
+
+function recipe_build {
+ ./configure --host=${HOST} --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,share}
+ skip=1
+}
diff --git a/recipes/git/recipe.sh b/recipes/git/recipe.sh
index 71b17ffaf..b19f0403a 100644
--- a/recipes/git/recipe.sh
+++ b/recipes/git/recipe.sh
@@ -1,6 +1,6 @@
VERSION=2.13.1
TAR=https://www.kernel.org/pub/software/scm/git/git-$VERSION.tar.xz
-BUILD_DEPENDS=(zlib)
+BUILD_DEPENDS=(zlib curl openssl expat)
HOST=x86_64-elf-redox
@@ -16,7 +16,7 @@ export RANLIB="${HOST}-ranlib"
export READELF="${HOST}-readelf"
export STRIP="${HOST}-strip"
-MAKEFLAGS="NO_MMAP=1"
+MAKEFLAGS="NO_MMAP=1 NEEDS_SSL_WITH_CURL=1 NEEDS_CRYPTO_WITH_SSL=1"
function recipe_version {
echo "$VERSION"
@@ -29,7 +29,10 @@ function recipe_update {
}
function recipe_build {
- ./configure --host=${HOST} --prefix=/ --with-zlib="${PWD}/../sysroot" ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=yes
+ sysroot="${PWD}/../sysroot"
+ export LDFLAGS="-L$sysroot/lib"
+ export CPPFLAGS="-I$sysroot/include"
+ ./configure --host=${HOST} --prefix=/ ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=yes ac_cv_lib_curl_curl_global_init=yes CURL_CONFIG=no
make ${MAKEFLAGS}
skip=1
}
--
GitLab