[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-332-g88c3e767b

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  88c3e767b29b2aeec6f9290cfb9efb749b4d6f82 (commit)
      from  53556fcded056aa62ffdc6bf0c97bff87d891dab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 88c3e767b29b2aeec6f9290cfb9efb749b4d6f82
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Wed Jul 28 10:48:59 2021 +0100

    github/workflow: disable libusb static link for windows build
    
    Current github build for windows is using dynamic libraries,
    but libftdi is requiring libusb static libraries.
    
    As a quick solution, just get rid of libftdi till it can be linked without
    static libusb.
    
    Change-Id: I9c7cb0b8853459ca48589674498403e255ade5cc
    Reported-by: Xiaofan <xia...@gm...>
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6384
    Reviewed-by: Xiaofan <xia...@gm...>
    Reviewed-by: Paul Fertser <fer...@gm...>
    Tested-by: jenkins

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 81e3a78bd..96a2d34f2 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -38,14 +38,6 @@ jobs:
           cd hidapi-hidapi-${HIDAPI_VER}
           ./bootstrap
           echo "HIDAPI_SRC=$PWD" >> $GITHUB_ENV
-      - name: Prepare libftdi
-        env:
-          LIBFTDI_VER: 1.5
-        run: |
-          mkdir -p $DL_DIR && cd $DL_DIR
-          wget "http://www.intra2net.com/en/developer/libftdi/download/libftdi1-${LIBFTDI_VER}.tar.bz2"
-          tar -xjf libftdi1-${LIBFTDI_VER}.tar.bz2
-          echo "LIBFTDI_SRC=$PWD/libftdi1-${LIBFTDI_VER}" >> $GITHUB_ENV
       - name: Prepare capstone
         env:
           CAPSTONE_VER: 4.0.2
@@ -60,9 +52,8 @@ jobs:
         env:
           MAKE_JOBS: 2
           HOST: i686-w64-mingw32
-          LIBUSB1_CONFIG: --enable-shared --enable-static
+          LIBUSB1_CONFIG: --enable-shared --disable-static
           HIDAPI_CONFIG: --enable-shared --disable-static --disable-testgui
-          LIBFTDI_CONFIG: "-DCMAKE_TOOLCHAIN_FILE='${{ env.LIBFTDI_SRC }}/cmake/Toolchain-i686-w64-mingw32.cmake' -DBUILD_TESTS:BOOL=off -DFTDIPP:BOOL=off -DPYTHON_BINDINGS:BOOL=off -DEXAMPLES:BOOL=off -DDOCUMENTATION:BOOL=off -DFTDI_EEPROM:BOOL=off"
           CAPSTONE_CONFIG: "CAPSTONE_BUILD_CORE_ONLY=yes CAPSTONE_STATIC=yes CAPSTONE_SHARED=no"
         run: |
           # check if there is tag pointing at HEAD, otherwise take the HEAD SHA-1 as OPENOCD_TAG

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/snapshot.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository