Skip to content

SPECS: systemtap: Align optional build options and dependencies#507

Open
Jingwiw wants to merge 2 commits into
openRuyi-Project:mainfrom
Jingwiw:cleanup-bcond/systemtap-avahi-dyninst-options
Open

SPECS: systemtap: Align optional build options and dependencies#507
Jingwiw wants to merge 2 commits into
openRuyi-Project:mainfrom
Jingwiw:cleanup-bcond/systemtap-avahi-dyninst-options

Conversation

@Jingwiw
Copy link
Copy Markdown
Member

@Jingwiw Jingwiw commented May 23, 2026

Changes

  • Make the avahi and dyninst configure options follow their bconds.

    Both bconds default to off in this spec. Upstream otherwise probes optional support when the option is not explicitly disabled, so pass the matching --without-* flags for the default build.

    Source: systemtap-5.5/configure.ac:477-492

    AC_ARG_WITH([avahi],
      AS_HELP_STRING([--without-avahi],
        [Do not use Avahi even if present]))
    
    AS_IF([test "x$with_avahi" != "xno"], [
      PKG_CHECK_MODULES([avahi], [avahi-client],
        [have_avahi=yes
         AC_DEFINE([HAVE_AVAHI], [1], [Define to 1 if you have the avahi libraries.])
        ], [have_avahi=no])
    ], [have_avahi=no])

    Source: systemtap-5.5/configure.ac:651-717

    AC_ARG_WITH([dyninst],
      AS_HELP_STRING([--with-dyninst=DIRECTORY],
        [find dyninst headers/libraries in DIRECTORY]))
    
    case "$with_dyninst" in
    no) ;;
    ''|yes) # Try a simple-minded distro search
         DYNINST_CXXFLAGS="-I/usr/include/dyninst"
         ...
    esac
    
    if test "$with_dyninst" != "no"; then
      AC_CHECK_HEADERS([dyninst/BPatch_object.h], [
          AC_DEFINE([HAVE_DYNINST],[1],[Define to 1 if Dyninst is enabled])
          have_dyninst=yes
          AC_MSG_NOTICE([dyninst support available])])
    fi
  • Use pkgconfig(sqlite3) for the SQLite build dependency.

    Upstream checks SQLite through pkg-config, and the local sqlite devel package provides sqlite3.pc.

    Source: systemtap-5.5/configure.ac:249-262

    AC_ARG_ENABLE([sqlite],
      AS_HELP_STRING([--enable-sqlite], [build with sqlite support]),
      [],
      [enable_sqlite=check])
    
    AS_IF([test "x$enable_sqlite" != xno],
      [PKG_CHECK_MODULES([sqlite3], [sqlite3 > 3.7],
        [AC_DEFINE([HAVE_LIBSQLITE3], [1], [Define to 1 if you have the 'sqlite3' library (-lsqlite3).])],
        [if test "x$enable_sqlite" != xcheck; then
          AC_MSG_FAILURE([--enable-sqlite was given, but test for sqlite > 3.7 failed])
         fi])])
  • Drop the duplicate avahi-devel BuildRequires from the server subpackage block.

    The avahi dependency is already expressed once as pkgconfig(avahi-client) under the same %{with avahi} condition, matching the upstream pkg-config check.

    Source: systemtap-5.5/configure.ac:477-487

    AC_ARG_WITH([avahi],
      AS_HELP_STRING([--without-avahi],
        [Do not use Avahi even if present]))
    
    AS_IF([test "x$with_avahi" != "xno"], [
      PKG_CHECK_MODULES([avahi], [avahi-client],
        [have_avahi=yes
         AC_DEFINE([HAVE_AVAHI], [1], [Define to 1 if you have the avahi libraries.])
        ], [have_avahi=no])
    ], [have_avahi=no])

AIGC Declaration: CodeX with gpt5.5 was used as coding agent.

Signed-off-by: Jingwiw wangjingwei@iscas.ac.cn

Jingwiw added 2 commits May 22, 2026 17:45
Signed-off-by: Jingwiw <wangjingwei@iscas.ac.cn>
Signed-off-by: Jingwiw <wangjingwei@iscas.ac.cn>
@openruyi-bot openruyi-bot Bot added BuildSystem: autotools Issue/PR related to autotools BuildSystem. Target: Rolling Targeting rolling/current branch. Workflow: Ready For Review Ready for review by anyone with domain expertise. labels May 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

BuildSystem: autotools Issue/PR related to autotools BuildSystem. Target: Rolling Targeting rolling/current branch. Workflow: Ready For Review Ready for review by anyone with domain expertise.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant