Attachment 6175 Details for Bug 30476 – v2

[patch] v2

deps_optimization.patch (text/plain), 1.32 KB, created by viy on 2014-11-18 17:11:36 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: viy

Created: 2014-11-18 17:11:36 MSK

Size: 1.32 KB

patch

obsolete

>diff --git a/build/interdep.c b/build/interdep.c
>index a8e10db..ecbc961 100644
>--- a/build/interdep.c
>+++ b/build/interdep.c
>@@ -773,18 +773,20 @@ void pruneExtraRDeps(struct Req *r, Spec spec)
> 
> int processInterdep(Spec spec)
> {
>-    struct Req *r = makeRequires(spec, 1);
>-    pruneDebuginfoSrc(r, spec);
>-    liftDebuginfoDeps(r, spec);
>-    r = freeRequires(r);
>-
>-    r = makeRequires(spec, 2);
>-    int optlevel = rpmExpandNumeric("%{?_deps_optimization}%{?!_deps_optimization:2}");
>-    if (optlevel >= 2) {
>+    struct Req *r;
>+    int optlevel = rpmExpandNumeric("%{?_deps_optimization}%{?!_deps_optimization:3}");
>+    if (optlevel >= 1) {
>+	r = makeRequires(spec, 1);
>+	pruneDebuginfoSrc(r, spec);
>+	liftDebuginfoDeps(r, spec);
>+	r = freeRequires(r);
>+    }
>+    if (optlevel >= 3) {
>+	r = makeRequires(spec, 2);
> 	pruneExtraDeps(r, spec);
> 	pruneExtraRDeps(r, spec);
>+	r = freeRequires(r);
>     }
>-    r = freeRequires(r);
>     return 0;
> }
> 
>diff --git a/build/reqprov.c b/build/reqprov.c
>index 46b9a88..024ca4f 100644
>--- a/build/reqprov.c
>+++ b/build/reqprov.c
>@@ -16,7 +16,7 @@ deps_opt_enabled (void)
> 	if (!initialized)
> 	{
> 		initialized = 1;
>-		enabled = rpmExpandNumeric ("%{?_deps_optimization}%{?!_deps_optimization:1}");
>+		enabled = rpmExpandNumeric ("%{?_deps_optimization}%{?!_deps_optimization:2}");
> 	}
> 
> 	return enabled;

Actions: View | Diff

Attachments on bug 30476: 6173 | 6175 | 6176