[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-2-g8bb926eb0

[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  8bb926eb01022998ceefe666f8df102e59404015 (commit)
      from  f8a6553e82919bcfd37436dd6b95e99bb261d04c (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 8bb926eb01022998ceefe666f8df102e59404015
Author: Marc Schink <de...@za...>
Date:   Sun May 22 16:15:00 2022 +0200

    Deprecate libjaylink Git submodule
    
    libjaylink was integrated into OpenOCD as a Git submodule, because at
    that time there was no official release and no packages for it.
    Today there are libjaylink packages for most popular distributions [1].
    
    Removing libjaylink from OpenOCD reduces build complexity in both
    projects and makes them more flexible with respect to the build system,
    for example.
    
    Disable the libjaylink submodule by default and announce it as
    deprecated feature that will be removed in the future. This gives
    package maintainers time to package libjaylink if not already done.
    
    [1] https://repology.org/project/libjaylink/versions
    
    Change-Id: I6166ba4757aee5c89a0506de867072f58fa5ec4b
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7129
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/configure.ac b/configure.ac
index 7f0955f13..4fcc91528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -373,9 +373,9 @@ AC_ARG_ENABLE([jimtcl-maintainer],
   [use_internal_jimtcl_maintainer=$enableval], [use_internal_jimtcl_maintainer=no])
 
 AC_ARG_ENABLE([internal-libjaylink],
-  AS_HELP_STRING([--disable-internal-libjaylink],
-  [Disable building internal libjaylink]),
-  [use_internal_libjaylink=$enableval], [use_internal_libjaylink=yes])
+  AS_HELP_STRING([--enable-internal-libjaylink],
+  [Enable building internal libjaylink]),
+  [use_internal_libjaylink=$enableval], [use_internal_libjaylink=no])
 
 AC_ARG_ENABLE([remote-bitbang],
   AS_HELP_STRING([--enable-remote-bitbang], [Enable building support for the Remote Bitbang jtag driver]),
@@ -713,7 +713,7 @@ AS_IF([test "x$enable_jlink" != "xno"], [
       AX_CONFIG_SUBDIR_OPTION([src/jtag/drivers/libjaylink],
 		[--enable-subproject-build])
     ], [
-      AC_MSG_ERROR([Internal libjaylink not found, run either 'git submodule init' and 'git submodule update' or disable internal libjaylink with --disable-internal-libjaylink.])
+      AC_MSG_ERROR([Internal libjaylink not found, run 'git submodule init' and 'git submodule update'.])
     ])
   ])
 ])
@@ -823,6 +823,12 @@ AC_CONFIG_FILES([
 ])
 AC_OUTPUT
 
+AS_IF([test "x$enable_jlink" != "xno"], [
+  AS_IF([test "x$use_internal_libjaylink" = "xyes"], [
+    AC_MSG_WARN([Using the internal libjaylink is deprecated and will not be possible in the future.])
+  ]])
+)
+
 echo
 echo
 echo OpenOCD configuration summary

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

Summary of changes:
 configure.ac | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository