Revert "ImageRules: do not include catalogs from .so in dependencies"

This reverts commit 368cac3c9d.

Actually excluded catalogs for .so in all cases, not just
dependencies.

Change-Id: I6f8997073c71a6a9fa3fa875e971242bc8487666
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10562
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
waddlesplash
2026-03-22 02:14:02 +00:00
parent cafe26877f
commit 4660bcfbab
-4
View File
@@ -275,9 +275,6 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
# files, add those, too.
local catalogTargets = $(target) + [ on $(target) return $(NEEDLIBS) ] ;
for catalogTarget in $(catalogTargets) {
# NEEDLIBS may also contain .so files, ignore these. They will be added to the image
# separately
if $(catalogTarget:S) != .so {
local catalogs
= [ on $(catalogTarget) return $(HAIKU_CATALOG_FILES) ] ;
if $(catalogs) {
@@ -289,7 +286,6 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
: $(catalogs) ;
}
}
}
# If the target is associated with MIME DB entries, add those, too.
local mimeDBEntries = [ on $(target) return $(HAIKU_MIME_DB_ENTRIES) ] ;