mirror of
https://github.com/OpenVPN/openvpn3.git
synced 2024-09-20 04:02:15 +02:00
build system: fix 'git apply'
When 'git apply' is run inside repository folder, it ignores files missing in index. To make it work, run 'git apply' outside of repository. Signed-off-by: Lev Stipakov <lev@openvpn.net>
This commit is contained in:
parent
3e49de7dea
commit
cfd6df5bc2
6
deps/asio/build-asio
vendored
6
deps/asio/build-asio
vendored
@ -36,11 +36,7 @@ else
|
|||||||
tar xfz $DL/$FNAME
|
tar xfz $DL/$FNAME
|
||||||
cd asio-$ASIO_VERSION
|
cd asio-$ASIO_VERSION
|
||||||
|
|
||||||
# apply pre-generated patches
|
apply_patches "asio"
|
||||||
for file in $O3/core/deps/asio/patches/*.patch; do
|
|
||||||
echo Applying patch: $file
|
|
||||||
git apply $file
|
|
||||||
done
|
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
|
17
deps/functions.sh
vendored
17
deps/functions.sh
vendored
@ -28,3 +28,20 @@ function download()
|
|||||||
|
|
||||||
check_download || return -1
|
check_download || return -1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function apply_patches()
|
||||||
|
{
|
||||||
|
DEP_NAME=$1
|
||||||
|
|
||||||
|
# change directory since git apply got confused when
|
||||||
|
# applying patches to files which are not found in index
|
||||||
|
DIR=$(pwd)
|
||||||
|
pushd ${DIR}
|
||||||
|
cd /tmp
|
||||||
|
# apply pre-generated patches
|
||||||
|
for file in $O3/core/deps/${DEP_NAME}/patches/*.patch; do
|
||||||
|
echo Applying patch: $file
|
||||||
|
git apply --directory ${DIR} --unsafe-path $file
|
||||||
|
done
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
6
deps/mbedtls/build-mbedtls
vendored
6
deps/mbedtls/build-mbedtls
vendored
@ -51,11 +51,7 @@ else
|
|||||||
# enable MD4 (needed for NTLM auth)
|
# enable MD4 (needed for NTLM auth)
|
||||||
perl -pi -e 's/^\/\/// if /#define MBEDTLS_MD4_C/' include/mbedtls/config.h
|
perl -pi -e 's/^\/\/// if /#define MBEDTLS_MD4_C/' include/mbedtls/config.h
|
||||||
|
|
||||||
# apply pre-generated patches
|
apply_patches "mbedtls"
|
||||||
for file in $O3/core/deps/mbedtls/patches/*.patch; do
|
|
||||||
echo Applying patch: $file
|
|
||||||
git apply $file
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "x$TARGET" == xlinux* || "x$TARGET" == xosx* ]]; then
|
if [[ "x$TARGET" == xlinux* || "x$TARGET" == xosx* ]]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user