From 57c93b2591ea7b24cd4a54ca206dc0ffa3178215 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 7 Apr 2021 15:05:52 +0200 Subject: [PATCH] reports.c: remove complex deps from deps-* files --- src/reports.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/reports.c b/src/reports.c index 3ded699..46ef84d 100644 --- a/src/reports.c +++ b/src/reports.c @@ -1760,7 +1760,8 @@ int print_datatables(struct configTag *ct, int arch) { logmsg(LOG_DEBUG,"writing deps files (1)"); struct providedList* provided = ct->providedlist_idx[arch][0]; while (provided) { - if (!strncmp("debuginfo(build-id)", provided->name, 20)) { + if (!strncmp("debuginfo(build-id)", provided->name, 20) || + provided->name[0] == '(') { // Filter out complex deps like "(name >= ver1 with name < ver2) provided = provided->next; continue; } @@ -1840,8 +1841,12 @@ int print_datatables(struct configTag *ct, int arch) { for (i = 0; i < currheaderlist->requirecount; i++) { if (currheaderlist->require[i]->resolved) { if (currheaderlist->require[i]->resolved->numproviders == 0) { - fprintf_depstable_filtered_var(fd,currheaderlist->require[i]->resolved->name); - fprintf(fd,"_unresolved_ "); + // Filter out complex deps like "(name >= ver1 with name < ver2) + if (currheaderlist->require[i]->resolved->name[0] != '(') { + fprintf_depstable_filtered_var(fd, + currheaderlist->require[i]->resolved->name); + fprintf(fd,"_unresolved_ "); + } } else if (currheaderlist->require[i]->resolved->numproviders == 1) { if ((i == 0 || !currheaderlist->require[i-1]->resolved ||