RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/build/ Makefile.am rpm/lib/ Makefile.am rpm/rpmdb/ Make...

From: Mark Hatle <mark.hatle@windriver.com>
Date: Tue 26 Jun 2007 - 21:47:41 CEST
Message-ID: <46816D5D.4030209@windriver.com>
Ralf, keep on chopping.. I owe you a beer or beverage of choice!  (This
makes cross compiling SOOO much easier with this stuff removed.)

--Mark

Ralf S. Engelschall wrote:
>   RPM Package Manager, CVS Repository
>   http://rpm5.org/cvs/
>   ____________________________________________________________________________
> 
>   Server: rpm5.org                         Name:   Ralf S. Engelschall
>   Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
>   Module: rpm                              Date:   26-Jun-2007 21:46:28
>   Branch: HEAD                             Handle: 2007062620462701
> 
>   Modified files:
>     rpm/build               Makefile.am
>     rpm/lib                 Makefile.am
>     rpm/rpmdb               Makefile.am
>     rpm/rpmio               Makefile.am
> 
>   Log:
>     Overriding "user" flags like LDFLAGS in Makefile.am is a big "no no"
>     in Automake. Instead the AM_LDFLAGS would have to be used. But in this
>     case just kick it out as contents like "-L$(RPM_BUILD_ROOT)$(usrlibdir)
>     -L$(DESTDIR)$(usrlibdir)" IMHO not even belongs into a AM_LDFLAGS as
>     it is an ugly Linux/RPM hack. If this is _really_ necessary under
>     some Linux platforms for building RPM, this has to go to rpm.spec,
>     please. But it is not acceptable to have such platform hacks directly in
>     Makefile.am files. Especially not via LDFLAGS overrides...
> 
>   Summary:
>     Revision    Changes     Path
>     2.60        +0  -2      rpm/build/Makefile.am
>     2.154       +0  -2      rpm/lib/Makefile.am
>     1.61        +0  -3      rpm/rpmdb/Makefile.am
>     1.87        +0  -2      rpm/rpmio/Makefile.am
>   ____________________________________________________________________________
> 
>   patch -p0 <<'@@ .'
>   Index: rpm/build/Makefile.am
>   ============================================================================
>   $ cvs diff -u -r2.59 -r2.60 Makefile.am
>   --- rpm/build/Makefile.am	26 Jun 2007 18:19:08 -0000	2.59
>   +++ rpm/build/Makefile.am	26 Jun 2007 19:46:27 -0000	2.60
>   @@ -19,8 +19,6 @@
>    pkginc_HEADERS = rpmbuild.h rpmspec.h
>    noinst_HEADERS = buildio.h
>    
>   -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
>   -
>    usrlibdir = $(libdir)@MARK64@
>    usrlib_LTLIBRARIES = librpmbuild.la
>    librpmbuild_la_SOURCES = \
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/lib/Makefile.am
>   ============================================================================
>   $ cvs diff -u -r2.153 -r2.154 Makefile.am
>   --- rpm/lib/Makefile.am	26 Jun 2007 12:57:14 -0000	2.153
>   +++ rpm/lib/Makefile.am	26 Jun 2007 19:46:27 -0000	2.154
>   @@ -26,8 +26,6 @@
>    mylibs = librpm.la
>    LIBS =
>    
>   -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
>   -
>    usrlibdir = $(libdir)@MARK64@
>    usrlib_LTLIBRARIES = librpm.la
>    librpm_la_SOURCES = \
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/rpmdb/Makefile.am
>   ============================================================================
>   $ cvs diff -u -r1.60 -r1.61 Makefile.am
>   --- rpm/rpmdb/Makefile.am	26 Jun 2007 18:19:08 -0000	1.60
>   +++ rpm/rpmdb/Makefile.am	26 Jun 2007 19:46:27 -0000	1.61
>   @@ -40,9 +40,6 @@
>    # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
>    libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
>    
>   -# XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
>   -LDFLAGS = @LDFLAGS@ -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
>   -
>    usrlibdir = $(libdir)@MARK64@
>    usrlib_LTLIBRARIES = librpmdb.la
>    librpmdb_la_SOURCES = \
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/rpmio/Makefile.am
>   ============================================================================
>   $ cvs diff -u -r1.86 -r1.87 Makefile.am
>   --- rpm/rpmio/Makefile.am	26 Jun 2007 12:57:16 -0000	1.86
>   +++ rpm/rpmio/Makefile.am	26 Jun 2007 19:46:28 -0000	1.87
>   @@ -22,8 +22,6 @@
>    	salsa10.h salsa20.h tiger.h \
>    	LzmaDecode.h rpmio_internal.h rpmlua.h rpmhook.h
>    
>   -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
>   -
>    usrlibdir = $(libdir)@MARK64@
>    usrlib_LTLIBRARIES = librpmio.la
>    librpmio_la_SOURCES = \
>   @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org
Received on Tue Jun 26 21:47:48 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.