aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-09-08 11:40:01 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-09-12 22:25:43 +0200
commitc16f6a7e4bcb99c172f46c292bad94e6edcff039 (patch)
treed567082b3b39d4867e874774c189687c3f724cd3
parent17a8e22f0bcc0cbb2f0571fb750128b90af87253 (diff)
downloadrpm-setup-c16f6a7e4bcb99c172f46c292bad94e6edcff039.tar
rpm-setup-c16f6a7e4bcb99c172f46c292bad94e6edcff039.tar.gz
rpm-setup-c16f6a7e4bcb99c172f46c292bad94e6edcff039.tar.bz2
rpm-setup-c16f6a7e4bcb99c172f46c292bad94e6edcff039.tar.xz
rpm-setup-c16f6a7e4bcb99c172f46c292bad94e6edcff039.zip
use internal dependency generator
(instead of so called "external generator") internal dependency generator is now used by all other distros and is way much faster :-)
-rw-r--r--NEWS5
-rw-r--r--build.macros.in9
2 files changed, 8 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index f9df824..8634817 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+- use internal dependency generator instead of "external generator"
+ (like all other distros) which is way much faster :-)
+ See:
+ o http://www.rpm.org/wiki/PackagerDocs/DependencyGenerator
+ o http://laiskiainen.org/blog/?p=35
- use upstream pkgconfigdeps.sh as we only have more checks because we were
still using the external generator
diff --git a/build.macros.in b/build.macros.in
index 864b14f..94bc858 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -82,8 +82,9 @@ Group: %{group}\
# Note: Disable (by commenting out) for legacy compatibility.
#%__check_multiarch_files @RPMLIBDIR@/check-multiarch-files %{buildroot}
-# Use internal dependency generator rather than external helpers?
-%_use_internal_dependency_generator 0
+# Use internal dependency generator rather than external helpers like all other distros
+# (much faster):
+%_use_internal_dependency_generator 1
%__find_provides @RPMVENDORDIR@/filter.sh '%{?_provides_exceptions:%{_provides_exceptions}}%{!?_provides_exceptions: }' '%{?_exclude_files_from_autoprov:%{_exclude_files_from_autoprov}}%{!?_exclude_files_from_autoprov: }' '%{buildroot}' @RPMVENDORDIR@/find-provides
%__find_requires @RPMVENDORDIR@/filter.sh '%{?_requires_exceptions:%{_requires_exceptions}}%{!?_requires_exceptions: }' '%{?_exclude_files_from_autoreq:%{_exclude_files_from_autoreq}}%{!?_exclude_files_from_autoreq: }' '%{buildroot}' @RPMVENDORDIR@/find-requires %{?buildroot:%{buildroot}} %{?_target_cpu:%{_target_cpu}}
@@ -572,7 +573,3 @@ sed -i -e 's/`git ls-files`/`find -type f`/' \\\
%check %%check \
[ %{_with check} -eq 1 ] || exit 0 \
%{nil}
-
-# use internal dep generator?
-# we can't use it for now as it breaks external dep generator
-#%_use_internal_dependency_generator 1