Attachment #6176 for bug #30476

View | Details | Raw Unified | Return to bug 30476
Collapse All | Expand All





int processInterdep(Spec spec)
{
    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;
}


Lines 15-22 deps_opt_enabled (void) Link Here

(-)a/build/reqprov.c (-1 / +5 lines)
15		15
16	if (!initialized)	16	if (!initialized)
17	{	17	{
		18	int optlevel = rpmExpandNumeric("%{?_deps_optimization}%{?!_deps_optimization:2}");
18	initialized = 1;	19	initialized = 1;
19	enabled = rpmExpandNumeric ("%{?_deps_optimization}%{?!_deps_optimization:1}");	20	if (optlevel >= 2)
		21	{
		22	enabled = 1;
		23	}
20	}	24	}
21		25
22	return enabled;	26	return enabled;

Return to bug 30476

Lines 773-790 void pruneExtraRDeps(struct Req *r, Spec spec) Link Here

(-)a/build/interdep.c (-9 / +11 lines)
773		773
774	int processInterdep(Spec spec)	774	int processInterdep(Spec spec)
775	{	775	{
776	struct Req *r = makeRequires(spec, 1);	776	struct Req *r;
777	pruneDebuginfoSrc(r, spec);	777	int optlevel = rpmExpandNumeric("%{?_deps_optimization}%{?!_deps_optimization:3}");
778	liftDebuginfoDeps(r, spec);	778	if (optlevel >= 1) {
779	r = freeRequires(r);	779	r = makeRequires(spec, 1);
780		780	pruneDebuginfoSrc(r, spec);
781	r = makeRequires(spec, 2);	781	liftDebuginfoDeps(r, spec);
782	int optlevel = rpmExpandNumeric("%{?_deps_optimization}%{?!_deps_optimization:2}");	782	r = freeRequires(r);
783	if (optlevel >= 2) {	783	}
		784	if (optlevel >= 3) {
		785	r = makeRequires(spec, 2);
784	pruneExtraDeps(r, spec);	786	pruneExtraDeps(r, spec);
785	pruneExtraRDeps(r, spec);	787	pruneExtraRDeps(r, spec);
		788	r = freeRequires(r);
786	}	789	}
787	r = freeRequires(r);
788	return 0;	790	return 0;
789	}	791	}
790		792