Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Split packages from cmake_modules when adding them as buildreqs #853

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Split packages from cmake_modules when adding them as buildreqs #853

merged 2 commits into from
Oct 1, 2024

Commits on Oct 1, 2024

  1. Split packages from cmake_modules when adding them as buildreqs 

    When parsing cmake files for find_package dependencies, we match against
entries in cmake_modules. Many of the entries of this file list
multiple packages, separated by space. Split on whitespace so we
actually feed only individual package names to each add_buildreq call.

Otherwise, if cmake_modules provides "extra-cmake-modules png2ico", for
example, and you have "png2ico" in buildreq_ban, the specfile would still
list both extra-cmake-modules and png2ico as build dependencies, because
add_buildreq only compared exact matches.
    @bwarden
    bwarden committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    965ebf1 View commit details
    Browse the repository at this point in the history

  2. parse_cmake: Also match hypen in pkg_check_modules(X) 

    If a cmake file defines a pkgconfig dependency with a hypen in it, make
sure we can handle it:
pkg_check_modules(DBUS-1 REQUIRED dbus-1 IMPORTED_TARGET)

Previously we used \w to match the first term (DBUS-1), which does *not*
match hyphens.
    @bwarden
    bwarden committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    3f8e5e7 View commit details
    Browse the repository at this point in the history