commit e379b28f6fcea8c842562cbf4ae193ace9612da1
Author: Kacper Kornet <[email protected]>
Date: Tue Aug 27 17:27:46 2013 +0100
search for macros in target dependent paths
When adbd48158b261b replaced macrofiles list to have proper order of
loading, it also hardcoded in it the architecture on which rpm was
build. Reverse that part of the change so the search paths for macros
depend again on --target argument.
rpm.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index b968f84..fea91ef 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1024,7 +1024,7 @@ sed -i \
--with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \
--with-lzma=external \
--with-neon=%{?with_neon:external}%{!?with_neon:no} \
-
--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/%{_target}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros'
\
+
--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros'
\
--without-path-versioned \
--with-pcre=external \
--with-popt=external \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/a274eb0e7494322c8d9fbee0be4e3d938291b080
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
