mirrors/solus-packages
1
1
Fork 0
mirror of https://github.com/getsolus/packages.git synced 2025-04-25 20:30:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

yauto: Handle PKG_CHECK_MODULES that define multiple modules

Browse source 
**Summary**

The PKG_CHECK_MODULES macro in configure.ac files can define more than one module.
Previously all the entries were simply added into the same `pkgconfig()`.
This properly separates them into their own entries.

Also fix adding dependencies for combined configure.ac/Python projects

Signed-off-by: Thomas Staudinger <Staudi.Kaos@gmail.com>
This commit is contained in:
Thomas Staudinger 2025-02-17 23:01:19 +01:00
parent 23b9d3a417
commit a2bf42bc1d
No known key found for this signature in database
1 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

49
common/Scripts/yauto.py
View file

@ -262,20 +262,27 @@ class AutoPackage:
splits = line.split(",")
part = splits[1] if len(splits) > 1 else splits[0]
part = part.replace("[", "").replace(")", "").replace("]", "")
splits = part.split(">=")
pkg = splits[0].strip()
dep = DepObject()
dep.name = pkg
if len(splits) > 1:
version = splits[1].strip()
# Can happen, we don't handle variable expansion.
if "$" in version:
splits = part.strip().split(" ")
version_info = None
for entry in splits:
if entry in ["=", "<=", ">="]:
version_info = True
continue
dep.version = version
# Check it hasn't been added
objs = [x for x in deps if x.name == dep.name]
if len(objs) == 0:
deps.append(dep)
if version_info:
# Can happen, we don't handle variable expansion.
version_info = False
if "$" in entry:
continue
deps[-1].version = entry
continue
if "$" in entry:
continue
dep = DepObject()
dep.name = entry
# Check it hasn't been added
objs = [x for x in deps if x.name == dep.name]
if len(objs) == 0:
deps.append(dep)
return deps
@ -326,16 +333,14 @@ description: |
total_str += "\nbuilddeps :\n"
if self.build_deps is not None and len(self.build_deps) > 0:
if self.compile_type == PYTHON_MODULES or self.component == "programming.python":
for dep in self.build_deps:
if len(dep.name.strip()) == 0:
continue
for dep in self.build_deps:
if len(dep.name.strip()) == 0:
continue
if dep.name in ["python-build", "python-installer",
"python-packaging", "python-wheel"]:
total_str += " - %s\n" % dep.name
else:
for dep in self.build_deps:
if len(dep.name.strip()) == 0:
continue
total_str += " - pkgconfig(%s)\n" % dep.name
continue
total_str += " - pkgconfig(%s)\n" % dep.name
if self.compile_type == GNOMEY:
setup = "%configure --disable-static"
elif self.compile_type == CMAKE: