Split packages from cmake_modules when adding them as buildreqs #853
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.