X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Flinux%2Fsigrok-cross-linux;h=2c8e559efde8cf6ae9a365bf1a4324a33600fae7;hp=2a4ff9da9137de1c872011e318fd061dcc8fe8e5;hb=616a4523599b4c2925b5811fdb3dfdd6fa12602e;hpb=d201254741cd85cb8dfe62d1907c386d56de2a47

diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index 2a4ff9d..2c8e559 100755
--- a/cross-compile/linux/sigrok-cross-linux
+++ b/cross-compile/linux/sigrok-cross-linux
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 set -e
@@ -66,89 +65,91 @@ cd $BUILDDIR
 
 GIT_CLONE="git clone --depth=1"
 
+REPO_BASE="git://sigrok.org"
+
 # -----------------------------------------------------------------------------
 
 # libserialport
-$GIT_CLONE git://sigrok.org/libserialport
+$GIT_CLONE $REPO_BASE/libserialport
 cd libserialport
 ./autogen.sh
 mkdir build
 cd build
-../configure $C
+$SB ../configure $C
 $SB make $PARALLEL $V
 make install $V
 cd ../..
 
 # libsigrok
 mkdir -p $PYPATH
-$GIT_CLONE git://sigrok.org/libsigrok
+$GIT_CLONE $REPO_BASE/libsigrok
 cd libsigrok
 ./autogen.sh
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P ../configure $C $JDK
+PKG_CONFIG_PATH=$P $SB ../configure $C $JDK
 $SB make $PARALLEL $V
 PYTHONPATH=$PYPATH $SB make install $V
 $SB make check $V
 cd ../..
 
 # libsigrokdecode
-$GIT_CLONE git://sigrok.org/libsigrokdecode
+$GIT_CLONE $REPO_BASE/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P ../configure $C
+PKG_CONFIG_PATH=$P $SB ../configure $C
 $SB make $PARALLEL $V
 make install $V
 $SB make check $V
 cd ../..
 
 # sigrok-firmware
-$GIT_CLONE git://sigrok.org/sigrok-firmware
+$GIT_CLONE $REPO_BASE/sigrok-firmware
 cd sigrok-firmware
 ./autogen.sh
 mkdir build
 cd build
 # Nothing gets cross-compiled here, we just need 'make install' basically.
-../configure $C
+$SB ../configure $C
 make install $V
 cd ../..
 
 # sigrok-firmware-fx2lafw
-$GIT_CLONE git://sigrok.org/sigrok-firmware-fx2lafw
+$GIT_CLONE $REPO_BASE/sigrok-firmware-fx2lafw
 cd sigrok-firmware-fx2lafw
 ./autogen.sh
 mkdir build
 cd build
 # We're building the fx2lafw firmware on the host, no need to cross-compile.
-../configure $C
+$SB ../configure $C
 make $PARALLEL $V
 make install $V
 cd ../..
 
 # sigrok-cli
-$GIT_CLONE git://sigrok.org/sigrok-cli
+$GIT_CLONE $REPO_BASE/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
 mkdir build
 cd build
 if [ `uname` = "FreeBSD" ]; then
 	# Temporary fix for: http://sigrok.org/bugzilla/show_bug.cgi?id=552
-	PKG_CONFIG_PATH=$P ../configure $C LDFLAGS=-lusb
+	PKG_CONFIG_PATH=$P $SB ../configure $C LDFLAGS=-lusb
 else
-	PKG_CONFIG_PATH=$P ../configure $C
+	PKG_CONFIG_PATH=$P $SB ../configure $C
 fi
 $SB make $PARALLEL $V
 make install $V
 cd ../..
 
 # PulseView
-$GIT_CLONE git://sigrok.org/pulseview
+$GIT_CLONE $REPO_BASE/pulseview
 cd pulseview
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P $SB cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y ..
+PKG_CONFIG_PATH=$P $SB cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y -DCMAKE_EXPORT_COMPILE_COMMANDS=y ..
 $SB make $PARALLEL $V
 make install $V
 $SB make test $V