From f31064caa177d3691911ef74850b561efb405b7f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 7 Apr 2019 10:47:52 -0600
Subject: [PATCH] Update pkgutils
---
pkgutils | 2 +-
recipes/git/recipe.sh | 22 ++++++++++++++++++----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/pkgutils b/pkgutils
index 4908c5e48..7297400ba 160000
--- a/pkgutils
+++ b/pkgutils
@@ -1 +1 @@
-Subproject commit 4908c5e486afca3371b20245b50a21a9eeeef084
+Subproject commit 7297400ba80310df28f9a8df27ae4c65efafc596
diff --git a/recipes/git/recipe.sh b/recipes/git/recipe.sh
index 1688d1c83..21c2a6f7b 100644
--- a/recipes/git/recipe.sh
+++ b/recipes/git/recipe.sh
@@ -3,7 +3,14 @@ TAR=https://www.kernel.org/pub/software/scm/git/git-$VERSION.tar.xz
BUILD_DEPENDS=(zlib curl openssl expat)
DEPENDS="ca-certificates"
-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"
+MAKEFLAGS=(
+ NEEDS_SSL_WITH_CURL=1
+ NEEDS_CRYPTO_WITH_SSL=1
+ NO_UNIX_SOCKETS=1
+ NEEDS_LIBICONV=
+ NEEDS_LIBRT=
+ BLK_SHA1=1
+)
function recipe_version {
echo "$VERSION"
@@ -19,8 +26,15 @@ function recipe_build {
sysroot="$(realpath ../sysroot)"
export LDFLAGS="-L$sysroot/lib"
export CPPFLAGS="-I$sysroot/include"
- ./configure --build=${BUILD} --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} -j"$(nproc)"
+ ./configure \
+ --build="${BUILD}" \
+ --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[@]}" -j"$(nproc)"
skip=1
}
@@ -36,7 +50,7 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" ${MAKEFLAGS} install
+ make DESTDIR="$dest" "${MAKEFLAGS[@]}" install
${STRIP} $1/bin/* || true
${STRIP} $1/libexec/git-core/* || true
rm -rf $1/share/man
--
GitLab