diff --git a/pkgutils b/pkgutils index 4908c5e486afca3371b20245b50a21a9eeeef084..7297400ba80310df28f9a8df27ae4c65efafc596 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 1688d1c8386d4fe1f372ab92d714701913e18016..21c2a6f7bf8a4c40164085be4aec6a8338224041 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