30476 2014-11-17 10:32:18 +0300 %_deps_optimization can't be disabled 2014-11-20 19:08:39 +0300 1 1 4 Development Sisyphus rpm-build unstable all Linux CLOSED FIXED P3 normal --- 1 viy placeholder arseny glebfm imz ldv mike placeholder vt qa-sisyphus oldest_to_newest 148853 0 6173 viy 2014-11-17 10:32:18 +0300 Created attachment 6173 proposed fix %_deps_optimization is ignored due to misprint %{?! instead of %{!? proposed fix: diff --git a/build/interdep.c b/build/interdep.c index a8e10db..89fba05 100644 --- a/build/interdep.c +++ b/build/interdep.c @@ -779,7 +779,7 @@ int processInterdep(Spec spec) r = freeRequires(r); r = makeRequires(spec, 2); - int optlevel = rpmExpandNumeric("%{?_deps_optimization}%{?!_deps_optimization:2}"); + int optlevel = rpmExpandNumeric("%{?_deps_optimization}%{!?_deps_optimization:2}"); if (optlevel >= 2) { pruneExtraDeps(r, spec); pruneExtraRDeps(r, spec); diff --git a/build/reqprov.c b/build/reqprov.c index 46b9a88..4d7f3fa 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:1}"); } return enabled; 148858 1 ldv 2014-11-17 14:38:47 +0300 $ rpm --eval '%{?!foobar:42}' 42 $ rpm --eval '%{!?foobar:42}' 42 148859 2 viy 2014-11-17 14:43:28 +0300 Гм. тогда в чем может быть проблема? не могу отключить %_deps_optimization. Пишу в спеке %define _deps_optimization 0 или в ~/.rpmmacros %_deps_optimization 0 а она все равно происходит. Проблема обнаружилась на моем texlive, где собственно сборка занимает 20 мин. find requires/provides 3 часа, а _deps_optimization -- несколько суток и я никак не могу ее отключить :( 148892 3 6175 viy 2014-11-18 17:11:36 +0300 Created attachment 6175 v2 148893 4 viy 2014-11-18 17:14:26 +0300 Пеоедалал патч, чтобы %_deps_optimization действительно работал. пробил по сизифу, там этот макрос не использовался нигде. поэтому поднял значения 0- отключено полностью 1- так как ранее при %_deps_optimization==0 2- так как ранее при %_deps_optimization==1 3- так как ранее при %_deps_optimization==2 патч: 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; 148894 5 6176 viy 2014-11-18 17:19:20 +0300 Created attachment 6176 v3 148895 6 viy 2014-11-18 17:20:53 +0300 исправленный патч чтобы соответствовать схеме 0- отключено полностью 1- так как ранее при %_deps_optimization==0 2- так как ранее при %_deps_optimization==1 3- так как ранее при %_deps_optimization==2 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..049867e 100644 --- a/build/reqprov.c +++ b/build/reqprov.c @@ -15,8 +15,12 @@ deps_opt_enabled (void) if (!initialized) { + int optlevel = rpmExpandNumeric("%{?_deps_optimization}%{?!_deps_optimization:2}"); initialized = 1; - enabled = rpmExpandNumeric ("%{?_deps_optimization}%{?!_deps_optimization:1}"); + if (optlevel >= 2) + { + enabled = 1; + } } return enabled; 148901 7 ldv 2014-11-19 02:47:25 +0300 (In reply to comment #6) > исправленный патч чтобы соответствовать схеме > > 0- отключено полностью > 1- так как ранее при %_deps_optimization==0 > 2- так как ранее при %_deps_optimization==1 > 3- так как ранее при %_deps_optimization==2 Я могу надеяться на commit message? 148904 8 viy 2014-11-19 09:40:21 +0300 commit c341c66290d4355752f0948bb05d995cbec1117c Author: Igor Vlasenko <viy@altlinux.org> Date: Wed Nov 19 08:31:11 2014 +0200 finer control for %_deps_optimization 0- disabled 1- old behaviour with %_deps_optimization=0 2- old behaviour with %_deps_optimization=1 3- old behaviour with %_deps_optimization=2 148924 9 repository-robot 2014-11-19 20:43:15 +0300 rpm-4.0.4-alt100.79 -> sisyphus: * Wed Nov 19 2014 Dmitry V. Levin <ldv@altlinux> 4.0.4-alt100.79 - rpmbuild: implemented finer control for %_deps_optimization (by viy@; closes: #30476). 6173 2014-11-17 10:32:18 +0300 2014-11-18 17:11:59 +0300 proposed fix deps_optimization.patch text/plain 892 viy ZGlmZiAtLWdpdCBhL2J1aWxkL2ludGVyZGVwLmMgYi9idWlsZC9pbnRlcmRlcC5jCmluZGV4IGE4 ZTEwZGIuLjg5ZmJhMDUgMTAwNjQ0Ci0tLSBhL2J1aWxkL2ludGVyZGVwLmMKKysrIGIvYnVpbGQv aW50ZXJkZXAuYwpAQCAtNzc5LDcgKzc3OSw3IEBAIGludCBwcm9jZXNzSW50ZXJkZXAoU3BlYyBz cGVjKQogICAgIHIgPSBmcmVlUmVxdWlyZXMocik7CiAKICAgICByID0gbWFrZVJlcXVpcmVzKHNw ZWMsIDIpOwotICAgIGludCBvcHRsZXZlbCA9IHJwbUV4cGFuZE51bWVyaWMoIiV7P19kZXBzX29w dGltaXphdGlvbn0lez8hX2RlcHNfb3B0aW1pemF0aW9uOjJ9Iik7CisgICAgaW50IG9wdGxldmVs ID0gcnBtRXhwYW5kTnVtZXJpYygiJXs/X2RlcHNfb3B0aW1pemF0aW9ufSV7IT9fZGVwc19vcHRp bWl6YXRpb246Mn0iKTsKICAgICBpZiAob3B0bGV2ZWwgPj0gMikgewogCXBydW5lRXh0cmFEZXBz KHIsIHNwZWMpOwogCXBydW5lRXh0cmFSRGVwcyhyLCBzcGVjKTsKZGlmZiAtLWdpdCBhL2J1aWxk L3JlcXByb3YuYyBiL2J1aWxkL3JlcXByb3YuYwppbmRleCA0NmI5YTg4Li40ZDdmM2ZhIDEwMDY0 NAotLS0gYS9idWlsZC9yZXFwcm92LmMKKysrIGIvYnVpbGQvcmVxcHJvdi5jCkBAIC0xNiw3ICsx Niw3IEBAIGRlcHNfb3B0X2VuYWJsZWQgKHZvaWQpCiAJaWYgKCFpbml0aWFsaXplZCkKIAl7CiAJ CWluaXRpYWxpemVkID0gMTsKLQkJZW5hYmxlZCA9IHJwbUV4cGFuZE51bWVyaWMgKCIlez9fZGVw c19vcHRpbWl6YXRpb259JXs/IV9kZXBzX29wdGltaXphdGlvbjoxfSIpOworCQllbmFibGVkID0g cnBtRXhwYW5kTnVtZXJpYyAoIiV7P19kZXBzX29wdGltaXphdGlvbn0leyE/X2RlcHNfb3B0aW1p emF0aW9uOjF9Iik7CiAJfQogCiAJcmV0dXJuIGVuYWJsZWQ7Cg== 6175 2014-11-18 17:11:36 +0300 2014-11-18 17:19:20 +0300 v2 deps_optimization.patch text/plain 1353 viy ZGlmZiAtLWdpdCBhL2J1aWxkL2ludGVyZGVwLmMgYi9idWlsZC9pbnRlcmRlcC5jCmluZGV4IGE4 ZTEwZGIuLmVjYmM5NjEgMTAwNjQ0Ci0tLSBhL2J1aWxkL2ludGVyZGVwLmMKKysrIGIvYnVpbGQv aW50ZXJkZXAuYwpAQCAtNzczLDE4ICs3NzMsMjAgQEAgdm9pZCBwcnVuZUV4dHJhUkRlcHMoc3Ry dWN0IFJlcSAqciwgU3BlYyBzcGVjKQogCiBpbnQgcHJvY2Vzc0ludGVyZGVwKFNwZWMgc3BlYykK IHsKLSAgICBzdHJ1Y3QgUmVxICpyID0gbWFrZVJlcXVpcmVzKHNwZWMsIDEpOwotICAgIHBydW5l RGVidWdpbmZvU3JjKHIsIHNwZWMpOwotICAgIGxpZnREZWJ1Z2luZm9EZXBzKHIsIHNwZWMpOwot ICAgIHIgPSBmcmVlUmVxdWlyZXMocik7Ci0KLSAgICByID0gbWFrZVJlcXVpcmVzKHNwZWMsIDIp OwotICAgIGludCBvcHRsZXZlbCA9IHJwbUV4cGFuZE51bWVyaWMoIiV7P19kZXBzX29wdGltaXph dGlvbn0lez8hX2RlcHNfb3B0aW1pemF0aW9uOjJ9Iik7Ci0gICAgaWYgKG9wdGxldmVsID49IDIp IHsKKyAgICBzdHJ1Y3QgUmVxICpyOworICAgIGludCBvcHRsZXZlbCA9IHJwbUV4cGFuZE51bWVy aWMoIiV7P19kZXBzX29wdGltaXphdGlvbn0lez8hX2RlcHNfb3B0aW1pemF0aW9uOjN9Iik7Cisg ICAgaWYgKG9wdGxldmVsID49IDEpIHsKKwlyID0gbWFrZVJlcXVpcmVzKHNwZWMsIDEpOworCXBy dW5lRGVidWdpbmZvU3JjKHIsIHNwZWMpOworCWxpZnREZWJ1Z2luZm9EZXBzKHIsIHNwZWMpOwor CXIgPSBmcmVlUmVxdWlyZXMocik7CisgICAgfQorICAgIGlmIChvcHRsZXZlbCA+PSAzKSB7CisJ ciA9IG1ha2VSZXF1aXJlcyhzcGVjLCAyKTsKIAlwcnVuZUV4dHJhRGVwcyhyLCBzcGVjKTsKIAlw cnVuZUV4dHJhUkRlcHMociwgc3BlYyk7CisJciA9IGZyZWVSZXF1aXJlcyhyKTsKICAgICB9Ci0g ICAgciA9IGZyZWVSZXF1aXJlcyhyKTsKICAgICByZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEv YnVpbGQvcmVxcHJvdi5jIGIvYnVpbGQvcmVxcHJvdi5jCmluZGV4IDQ2YjlhODguLjAyNGNhNGYg MTAwNjQ0Ci0tLSBhL2J1aWxkL3JlcXByb3YuYworKysgYi9idWlsZC9yZXFwcm92LmMKQEAgLTE2 LDcgKzE2LDcgQEAgZGVwc19vcHRfZW5hYmxlZCAodm9pZCkKIAlpZiAoIWluaXRpYWxpemVkKQog CXsKIAkJaW5pdGlhbGl6ZWQgPSAxOwotCQllbmFibGVkID0gcnBtRXhwYW5kTnVtZXJpYyAoIiV7 P19kZXBzX29wdGltaXphdGlvbn0lez8hX2RlcHNfb3B0aW1pemF0aW9uOjF9Iik7CisJCWVuYWJs ZWQgPSBycG1FeHBhbmROdW1lcmljICgiJXs/X2RlcHNfb3B0aW1pemF0aW9ufSV7PyFfZGVwc19v cHRpbWl6YXRpb246Mn0iKTsKIAl9CiAKIAlyZXR1cm4gZW5hYmxlZDsK 6176 2014-11-18 17:19:20 +0300 2014-11-18 17:19:20 +0300 v3 deps_optimization.patch text/plain 1412 viy ZGlmZiAtLWdpdCBhL2J1aWxkL2ludGVyZGVwLmMgYi9idWlsZC9pbnRlcmRlcC5jCmluZGV4IGE4 ZTEwZGIuLmVjYmM5NjEgMTAwNjQ0Ci0tLSBhL2J1aWxkL2ludGVyZGVwLmMKKysrIGIvYnVpbGQv aW50ZXJkZXAuYwpAQCAtNzczLDE4ICs3NzMsMjAgQEAgdm9pZCBwcnVuZUV4dHJhUkRlcHMoc3Ry dWN0IFJlcSAqciwgU3BlYyBzcGVjKQogCiBpbnQgcHJvY2Vzc0ludGVyZGVwKFNwZWMgc3BlYykK IHsKLSAgICBzdHJ1Y3QgUmVxICpyID0gbWFrZVJlcXVpcmVzKHNwZWMsIDEpOwotICAgIHBydW5l RGVidWdpbmZvU3JjKHIsIHNwZWMpOwotICAgIGxpZnREZWJ1Z2luZm9EZXBzKHIsIHNwZWMpOwot ICAgIHIgPSBmcmVlUmVxdWlyZXMocik7Ci0KLSAgICByID0gbWFrZVJlcXVpcmVzKHNwZWMsIDIp OwotICAgIGludCBvcHRsZXZlbCA9IHJwbUV4cGFuZE51bWVyaWMoIiV7P19kZXBzX29wdGltaXph dGlvbn0lez8hX2RlcHNfb3B0aW1pemF0aW9uOjJ9Iik7Ci0gICAgaWYgKG9wdGxldmVsID49IDIp IHsKKyAgICBzdHJ1Y3QgUmVxICpyOworICAgIGludCBvcHRsZXZlbCA9IHJwbUV4cGFuZE51bWVy aWMoIiV7P19kZXBzX29wdGltaXphdGlvbn0lez8hX2RlcHNfb3B0aW1pemF0aW9uOjN9Iik7Cisg ICAgaWYgKG9wdGxldmVsID49IDEpIHsKKwlyID0gbWFrZVJlcXVpcmVzKHNwZWMsIDEpOworCXBy dW5lRGVidWdpbmZvU3JjKHIsIHNwZWMpOworCWxpZnREZWJ1Z2luZm9EZXBzKHIsIHNwZWMpOwor CXIgPSBmcmVlUmVxdWlyZXMocik7CisgICAgfQorICAgIGlmIChvcHRsZXZlbCA+PSAzKSB7CisJ ciA9IG1ha2VSZXF1aXJlcyhzcGVjLCAyKTsKIAlwcnVuZUV4dHJhRGVwcyhyLCBzcGVjKTsKIAlw cnVuZUV4dHJhUkRlcHMociwgc3BlYyk7CisJciA9IGZyZWVSZXF1aXJlcyhyKTsKICAgICB9Ci0g ICAgciA9IGZyZWVSZXF1aXJlcyhyKTsKICAgICByZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEv YnVpbGQvcmVxcHJvdi5jIGIvYnVpbGQvcmVxcHJvdi5jCmluZGV4IDQ2YjlhODguLjA0OTg2N2Ug MTAwNjQ0Ci0tLSBhL2J1aWxkL3JlcXByb3YuYworKysgYi9idWlsZC9yZXFwcm92LmMKQEAgLTE1 LDggKzE1LDEyIEBAIGRlcHNfb3B0X2VuYWJsZWQgKHZvaWQpCiAKIAlpZiAoIWluaXRpYWxpemVk KQogCXsKKwkJaW50IG9wdGxldmVsID0gcnBtRXhwYW5kTnVtZXJpYygiJXs/X2RlcHNfb3B0aW1p emF0aW9ufSV7PyFfZGVwc19vcHRpbWl6YXRpb246Mn0iKTsKIAkJaW5pdGlhbGl6ZWQgPSAxOwot CQllbmFibGVkID0gcnBtRXhwYW5kTnVtZXJpYyAoIiV7P19kZXBzX29wdGltaXphdGlvbn0lez8h X2RlcHNfb3B0aW1pemF0aW9uOjF9Iik7CisJCWlmIChvcHRsZXZlbCA+PSAyKQorCQkJeworCQkJ CWVuYWJsZWQgPSAxOworCQkJfQogCX0KIAogCXJldHVybiBlbmFibGVkOwo=