From: Rene Kita <g...@rkta.de>
Due to the hard-coded relative paths, the script failed when not called
from the correct directory. This patch fixes this by converting the path
to an absolute one.
---
The problem is probably also present in sigrok-cross-android, but the
script failed to run here and I don't have time to figure it out. Will
not change code, if I can't run it.
cross-compile/mingw/sigrok-cross-mingw | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/cross-compile/mingw/sigrok-cross-mingw
b/cross-compile/mingw/sigrok-cross-mingw
index 52895b7..ec4093d 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -45,6 +45,9 @@ DEBUG=0
# -----------------------------------------------------------------------------
+# Save absolute location of the script to copy files provided by sigrok-util
+SCRIPTBASE="$PWD"/$(dirname "$0")
+
WGET="wget -c --quiet"
GIT_CLONE="git clone --depth=1"
@@ -108,7 +111,7 @@ tar xzf $PREFIX/Python34.tar.gz -C $PREFIX
# Fix for bug #1195.
if [ $TARGET = "x86_64" ]; then
- patch -p1 $PREFIX/Python34/include/pyconfig.h < ../pyconfig.patch
+ patch -p1 $PREFIX/Python34/include/pyconfig.h <
"$SCRIPTBASE"/pyconfig.patch
fi
# Create a dummy python3.pc file so that pkg-config finds Python 3.
@@ -225,7 +228,7 @@ cd ..
# PulseView
$GIT_CLONE $REPO_BASE/pulseview
cd pulseview
-cp ../../FileAssociation.nsh contrib
+cp "$SCRIPTBASE"/FileAssociation.nsh contrib
$CMAKE \
-DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
@@ -245,4 +248,3 @@ else
makensis -DPE64=1 contrib/pulseview_cross.nsi
fi
cd ..
-
--
2.25.1
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
