RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/ configure.ac devtool.conf

From: Jeff Johnson <n3npq@mac.com>
Date: Sun 09 Jan 2011 - 03:43:00 CET
Message-Id: <86DEE32F-E722-420D-8898-4382D64CC391@mac.com>
Dare I ask?

WTF arre "pre-macros"?

If they are what I think they are (i.e same as --predefine),
it ain't gonna work.

Been there, done that.

73 de Jeff


On Jan 8, 2011, at 9:16 PM, Per Řyvind Karlsen wrote:

>  RPM Package Manager, CVS Repository
>  http://rpm5.org/cvs/
>  ____________________________________________________________________________
> 
>  Server: rpm5.org                         Name:   Per Řyvind Karlsen
>  Root:   /v/rpm/cvs                       Email:  pkarlsen@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
Received on Sun Jan 9 03:44:09 2011
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.