Skip to content

Commit 51e1e4a

Browse files
committed
Fix Cross compile failed in linux
1 parent 1dd3ba4 commit 51e1e4a

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

avrdude-6.3.build.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ COMMON_FLAGS=""
4242

4343
if [[ $CROSS_COMPILE == "mingw" ]] ; then
4444
CFLAGS="-DHAVE_LIBHIDAPI $CFLAGS"
45-
LIBS="-lhidapi -lsetupapi"
45+
LIBS="-lhidapi -lsetupapi -Wl,-Bstatic -lwinpthread"
4646
fi
4747

4848
if [[ $OS == "Msys" ]] ; then

libftdi-1.4.build.bash

100644100755
+4-6
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,13 @@ rm -rf libftdi1-1.4/build
3131
mkdir libftdi1-1.4/build
3232

3333
cd libftdi1-1.4/
34-
if [[ $OS == "Msys" ]] ; then
35-
patch -p1 < ../libftdi1-1.4-patches/01-add_sharedlibs_flag.patch
36-
fi
34+
patch -p1 < ../libftdi1-1.4-patches/01-add_sharedlibs_flag.patch
3735
cd build/
3836

39-
CMAKE_EXTRA_FLAG=""
37+
CMAKE_EXTRA_FLAG="-DSHAREDLIBS=OFF -DBUILD_TESTS=OFF"
4038

41-
if [[ $OS == "Msys" ]] ; then
42-
CMAKE_EXTRA_FLAG="$CMAKE_EXTRA_FLAG -DBUILD_TESTS=OFF -DSHAREDLIBS=OFF"
39+
if [[ $OS == "GNU/Linux" ]] ; then
40+
CMAKE_EXTRA_FLAG="$CMAKE_EXTRA_FLAG -DCMAKE_TOOLCHAIN_FILE=./cmake/Toolchain-i686-w64-mingw32.cmake"
4341
fi
4442

4543
cmake $CMAKE_EXTRA_FLAG -DCMAKE_INSTALL_PREFIX="$PREFIX" -DLIBUSB_INCLUDE_DIR="$PREFIX/include/libusb-1.0" -DLIBFTDI_LIBRARY_DIRS="$PREFIX/lib" -DLIBUSB_LIBRARIES="usb-1.0" ../

libusb-compat-0.1.5.build.bash

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ if [[ $OS == "Msys" || $OS == "Cygwin" || $CROSS_COMPILE_HOST == "i686-w64-mingw
2727
wget http://download.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip
2828
fi
2929
unzip libusb-win32-bin-1.2.6.0.zip
30-
#cp libusb-win32-bin-1.2.6.0/bin/x86/libusb0_x86.dll $PREFIX/bin/libusb0.dll
30+
mkdir -p $PREFIX/bin/
31+
cp libusb-win32-bin-1.2.6.0/bin/x86/libusb0_x86.dll $PREFIX/bin/libusb0.dll
3132
cp libusb-win32-bin-1.2.6.0/include/lusb0_usb.h $PREFIX/include
3233
cp libusb-win32-bin-1.2.6.0/lib/gcc/libusb.a $PREFIX/lib
3334
exit 0

0 commit comments

Comments
 (0)