RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 09-Jan-2011 03:16:48
Branch: HEAD Handle: 2011010902160415
Modified files:
rpm configure.ac devtool.conf
Log:
add --with-path-premacros option to get reproducible builds with
devtool target
Summary:
Revision Changes Path
2.476 +15 -0 rpm/configure.ac
2.369 +1 -0 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.475 -r2.476 configure.ac
--- rpm/configure.ac 29 Dec 2010 16:07:59 -0000 2.475
+++ rpm/configure.ac 9 Jan 2011 02:16:04 -0000 2.476
@@ -2146,6 +2146,21 @@
AC_MSG_RESULT([$SYSCONFIGDIR])
dnl # determine RPM macro files path
+AC_MSG_CHECKING([for RPM pre-macro files path])
+AC_ARG_WITH(
+ [path-premacros],
+ AS_HELP_STRING([--with-path-premacros=ARG], [build with colon-separated
RPM pre-macro files path]),
+ [if test ".$withval" != .no; then
+ PREMACROFILES="$withval"
+ AC_DEFINE_UNQUOTED(
+ [PREMACROFILES], ["$PREMACROFILES"],
+ [Colon separated RPM pre-macro files path])
+ AC_MSG_RESULT([$PREMACROFILES])
+ else
+ AC_MSG_RESULT(no)
+ fi]
+)
+
AC_MSG_CHECKING([for RPM macro files path])
MACROFILES="${USRLIBRPM}/macros"
MACROFILES="${MACROFILES}:${USRLIBRPM}/%{_target}/macros"
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.368 -r2.369 devtool.conf
--- rpm/devtool.conf 27 Dec 2010 17:13:59 -0000 2.368
+++ rpm/devtool.conf 9 Jan 2011 02:16:19 -0000 2.369
@@ -807,6 +807,7 @@
--with-valgrind \
--with-cpuinfo \
--with-vendor=mandriva \
+ --with-path-premacros=/etc/rpm/premacros.d \
--enable-build-pic \
--enable-build-versionscript \
--enable-build-warnings \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
