commit 8029452c0c57171d3edf032842e6d4e8fc5d5f7c
Author: Jacek Konieczny <[email protected]>
Date: Mon Nov 23 20:51:16 2015 +0100
Optimize python dependency generation
Run the python dependency helper only for the most important files:
- python scripts
- only the first pyc/pyo found in /usr/lib*/python and
/usr/share*/python
- the PKG-INFO file in the egg-info directory
This should be enough to extract all the dependencies in most python
packages.
Release: 27
fast_python_deps.patch | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
rpm.spec | 4 ++-
2 files changed, 81 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 2abef4b..6944aa3 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.15
-Release: 26
+Release: 27
License: LGPL v2.1
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -178,6 +178,7 @@ Patch88: %{name}-rpmtdnext.patch
Patch89: disable-header-verification.patch
Patch90: %{name}-cppcompat.patch
Patch91: py-disable-fetch.patch
+Patch92: fast_python_deps.patch
# Patches imported from Mandriva
@@ -1014,6 +1015,7 @@ cd -
%patch1049 -p1
%patch83 -p1
+%patch92 -p1
%patch1050 -p1
diff --git a/fast_python_deps.patch b/fast_python_deps.patch
new file mode 100644
index 0000000..1decba7
--- /dev/null
+++ b/fast_python_deps.patch
@@ -0,0 +1,78 @@
+diff -dur -x '*~' -x '*.orig' rpm-5.4.15.orig/lib/rpmfc.c
rpm-5.4.15/lib/rpmfc.c
+--- rpm-5.4.15.orig/lib/rpmfc.c 2015-11-23 20:38:44.516459734 +0100
++++ rpm-5.4.15/lib/rpmfc.c 2015-11-23 20:39:56.267070624 +0100
+@@ -604,8 +604,6 @@
+ /* XXX "a /usr/bin/python -t script text executable" */
+ /* XXX "python 2.3 byte-compiled" */
+ { " /usr/bin/python", RPMFC_PYTHON|RPMFC_INCLUDE },
+- { "python ", RPMFC_PYTHON|RPMFC_INCLUDE },
+- { "Python script", RPMFC_PYTHON|RPMFC_INCLUDE },
+
+ { "libtool library ", RPMFC_LIBTOOL|RPMFC_INCLUDE },
+ { "pkgconfig ", RPMFC_PKGCONFIG|RPMFC_INCLUDE },
+@@ -1114,6 +1112,9 @@
+ int i;
+ int xx;
+ int skipping;
++ int l;
++ const char * lastPycDir = NULL;
++ const char * p;
+
+ miRE mire;
+ int skipProv = fc->skipProv;
+@@ -1156,8 +1157,25 @@
+ if ((fn[0] == '3' && fn[1] == '2') ||
+ (fn[0] == '6' && fn[1] == '4'))
+ fn += 2;
+- if (!strncmp(fn, "/python", sizeof("/python")-1))
+- fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
++ if (!strncmp(fn, "/python", sizeof("/python")-1)) {
++ l = strlen(fn);
++ if (fn[l-4] == '.' && fn[l-3] == 'p' && fn[l-2] == 'y'
++ && (fn[l-1] == 'c' || fn[l-1] == 'o')) {
++ p = strchr(fn, '/');
++ if (p) {
++ l = p - fc->fn[fc->ix];
++ if (!lastPycDir || strncmp(lastPycDir,
fc->fn[fc->ix], l)) {
++ /* one pyc/pyo file per python library
directory should be enough to get the dependency */
++ fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
++ lastPycDir = fc->fn[fc->ix];
++ }
++ }
++ }
++ else if (l > 17 && !strcmp(fn + l - 17,
"egg-info/PKG-INFO")) {
++ /* get all PKG-INFO files for egg-info data */
++ fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
++ }
++ }
+ else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
+ fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
+ if ((strstr(fn, ".gemspec") || strstr(fn, "rbconfig.rb"))) {
+@@ -1184,8 +1202,25 @@
+ fn = strstr(fc->fn[fc->ix], "/usr/share");
+ if (fn) {
+ fn += sizeof("/usr/share")-1;
+- if (!strncmp(fn, "/python", sizeof("/python")-1))
+- fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
++ if (!strncmp(fn, "/python", sizeof("/python")-1)) {
++ l = strlen(fn);
++ if (fn[l-4] == '.' && fn[l-3] == 'p' && fn[l-2] == 'y'
++ && (fn[l-1] == 'c' || fn[l-1] == 'o')) {
++ p = strchr(fn, '/');
++ if (p) {
++ l = p - fc->fn[fc->ix];
++ if (!lastPycDir || strncmp(lastPycDir,
fc->fn[fc->ix], l)) {
++ /* one pyc/pyo file per python library
directory should be enough to get the dependency */
++ fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
++ lastPycDir = fc->fn[fc->ix];
++ }
++ }
++ }
++ else if (l > 17 && !strcmp(fn + l - 17,
"egg-info/PKG-INFO")) {
++ /* get all PKG-INFO files for egg-info data */
++ fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
++ }
++ }
+ else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1) ||
!strncmp(fn, "/gems/specifications", sizeof("/gems/specifications")-1)) {
+ fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
+ if ((strstr(fn, ".gemspec") || strstr(fn, "rbconfig.rb"))) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/8029452c0c57171d3edf032842e6d4e8fc5d5f7c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
