mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 14:46:31 +00:00
- fixes for bugs introduced with the MacOS10 support (Heikki Lindholm)
This commit is contained in:
parent
9e59c9bc00
commit
f506f7c893
@ -42,7 +42,7 @@ $(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
|
|||||||
$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
|
$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
|
||||||
(cd $(SED_DIR1); rm -rf config.cache; \
|
(cd $(SED_DIR1); rm -rf config.cache; \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=$(HOST_SED_DIR) \
|
--prefix=/usr \
|
||||||
);
|
);
|
||||||
touch $(SED_DIR1)/.configured
|
touch $(SED_DIR1)/.configured
|
||||||
|
|
||||||
|
@ -1,11 +1,5 @@
|
|||||||
SEDLIST="/usr/bin/sed /bin/sed sed gnused gsed"
|
SEDLIST="/usr/bin/sed /bin/sed sed gnused gsed"
|
||||||
|
|
||||||
DIFF=$(which diff)
|
|
||||||
if ! test -x "$DIFF" ; then
|
|
||||||
/bin/echo -e "\n\ntesting for sed needs 'diff' on your build machine\n";
|
|
||||||
exit 1;
|
|
||||||
fi;
|
|
||||||
|
|
||||||
for SED in $SEDLIST
|
for SED in $SEDLIST
|
||||||
do
|
do
|
||||||
if ! test -x $SED ; then
|
if ! test -x $SED ; then
|
||||||
@ -17,20 +11,20 @@ do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "HELLO" > .sedtest
|
echo "HELLO" > .sedtest
|
||||||
echo "GOODBYE" > .sedtest-correct
|
|
||||||
$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1
|
$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1
|
||||||
|
RESULT=$(cat .sedtest)
|
||||||
|
|
||||||
if test $? != 0 ; then
|
if test $? != 0 ; then
|
||||||
SED=""
|
SED=""
|
||||||
elif test -e ".sedtest-e" ; then
|
elif test -e ".sedtest-e" ; then
|
||||||
rm -f ".sedtest-e"
|
rm -f ".sedtest-e"
|
||||||
SED=""
|
SED=""
|
||||||
elif ! $DIFF ".sedtest" ".sedtest-correct" > /dev/null ; then
|
elif [ -z "${RESULT}" ] || [ "${RESULT}" != "GOODBYE"] > /dev/null ;
|
||||||
echo "diff failed"
|
then
|
||||||
SED=""
|
SED=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f .sedtest .sedtest-correct
|
rm -f .sedtest
|
||||||
if [ ! -z "$SED" ] ; then
|
if [ ! -z "$SED" ] ; then
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user