jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/build: use global lock as sed -i $SYSROOT_PREFIX/usr/lib/*.la is racy

Browse Source
This commit is contained in:
MilhouseVH 2019-02-08 17:17:43 +00:00
parent 750772193d
commit d0034ab95e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/build
View File

@ -368,6 +368,14 @@ fi
pkg_call_exists post_make_$TARGET && pkg_call post_make_$TARGET pkg_call_exists post_make_$TARGET && pkg_call post_make_$TARGET
# make install writes directly to sysroot which then needs fixing up - this is racy
if listcontains "configure:target cmake-make:target autotools:target make:target" "${PKG_TOOLCHAIN}:${TARGET}"; then
acquire_exclusive_lock "${PKG_NAME}:${TARGET}" "build"
PKG_NEED_UNLOCK=yes
else
PKG_NEED_UNLOCK=no
fi
# make install # make install
pkg_call_exists pre_makeinstall_$TARGET && pkg_call pre_makeinstall_$TARGET pkg_call_exists pre_makeinstall_$TARGET && pkg_call pre_makeinstall_$TARGET
@ -409,6 +417,15 @@ fi
pkg_call_exists post_makeinstall_$TARGET && pkg_call post_makeinstall_$TARGET pkg_call_exists post_makeinstall_$TARGET && pkg_call post_makeinstall_$TARGET
# This is the racy part - one or more processes may be creating, modifying or deleting
# $SYSROOT_PREFIX/usr/lib/*.la files while another (eg. this) process is rewriting the same
# files as it fixes up the libdir prefix. Eugh.
for i in $(find $SYSROOT_PREFIX/usr/lib/ -name "*.la" 2>/dev/null); do
sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $i
done
[ "${PKG_NEED_UNLOCK}" = "yes" ] && release_exclusive_lock "${PKG_NAME}:${TARGET}" "build" || true
if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then
if [ -d $INSTALL ]; then if [ -d $INSTALL ]; then
rm -rf $INSTALL/{usr/,}include rm -rf $INSTALL/{usr/,}include
@ -454,10 +471,6 @@ fi
cd $ROOT cd $ROOT
for i in $(find $SYSROOT_PREFIX/usr/lib/ -name "*.la" 2>/dev/null); do
sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $i
done
PKG_DEEPHASH=$(calculate_stamp) PKG_DEEPHASH=$(calculate_stamp)
for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do
echo "STAMP_$i=\"${!i}\"" >> $STAMP echo "STAMP_$i=\"${!i}\"" >> $STAMP