diff options
| -rw-r--r-- | app-arch/rpm/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/rpm/files/rpm-4.4.6-stupidness.patch | 155 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.4.6.ebuild | 19 |
3 files changed, 168 insertions, 14 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index 03a7207558f0..0c90e0257500 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/rpm -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.64 2006/10/01 19:38:24 dertobi123 Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.65 2006/10/08 00:36:29 vapier Exp $ + + 08 Oct 2006; Mike Frysinger <vapier@gentoo.org> + +files/rpm-4.4.6-stupidness.patch, rpm-4.4.6.ebuild: + Cleanup build system. 01 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> rpm-4.4.6.ebuild: hppa stable, bug #140721 diff --git a/app-arch/rpm/files/rpm-4.4.6-stupidness.patch b/app-arch/rpm/files/rpm-4.4.6-stupidness.patch new file mode 100644 index 000000000000..9085fa7017dd --- /dev/null +++ b/app-arch/rpm/files/rpm-4.4.6-stupidness.patch @@ -0,0 +1,155 @@ +Try and disable over-engineering in the rpm build system. + +--- configure.ac ++++ configure.ac +@@ -117,7 +117,7 @@ + dnl + with_selinuxval=no + AC_MSG_CHECKING(flag used by libtool to link rpm) +-if test X"$GCC" = Xyes ; then ++if false ; then + case "$target" in + *-*-linux*) LDFLAGS_STATIC="-all-static" + with_selinuxval=yes ;; +@@ -160,14 +160,6 @@ + dnl XXX Test for libpthread.a that is NPTL aware (static link only). + dnl + LDFLAGS_NPTL= +-if test -f /usr/lib/nptl/libpthread.a ; then +- LDFLAGS_NPTL="-L/usr/lib/nptl" +-# INCPATH="$INCPATH -I/usr/include/nptl" +-fi +-if test -f /usr/lib64/nptl/libpthread.a ; then +- LDFLAGS_NPTL="-L/usr/lib64/nptl" +-# INCPATH="$INCPATH -I/usr/include/nptl" +-fi + AC_SUBST(LDFLAGS_NPTL) + + dnl +@@ -1289,9 +1281,7 @@ + + dnl XXX Choose /usr/lib or /usr/lib64 for library installs. + MARK64= +-case "${target_cpu}" in +-x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;; +-esac ++MARK64=ALL-SCREWED-UP + AC_SUBST(MARK64) + + # For some systems we know that we have ld_version scripts. +@@ -1363,7 +1363,7 @@ + AC_SUBST(LOCALEDIR) + LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`" + AC_SUBST(LIBDIR) +-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" ++RPMCONFIGDIR="`echo ${LIBDIR}/rpm`" + AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR", + [Full path to rpm global configuration directory (usually /usr/lib/rpm)]) + AC_SUBST(RPMCONFIGDIR) +--- python/Makefile.am ++++ python/Makefile.am +@@ -4,8 +4,8 @@ + + LINT = splint + +-pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@ +-pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@ ++pylibdir = $(libdir)/python@WITH_PYTHON_VERSION@ ++pyincdir = $(includedir)/python@WITH_PYTHON_VERSION@ + + SUBDIRS = rpm + +--- python/rpm/Makefile.am ++++ python/rpm/Makefile.am +@@ -4,8 +4,8 @@ + + PYVER = @WITH_PYTHON_VERSION@ + +-pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@ +-pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@ ++pylibdir = $(libdir)/python@WITH_PYTHON_VERSION@ ++pyincdir = $(includedir)/python@WITH_PYTHON_VERSION@ + + EXTRA_DIST = \ + __init__.py +--- lib/Makefile.am ++++ lib/Makefile.am +@@ -29,10 +29,7 @@ + mylibs = librpm.la + LIBS = + +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +- +-usrlibdir = $(libdir)@MARK64@ +-usrlib_LTLIBRARIES = librpm.la ++lib_LTLIBRARIES = librpm.la + librpm_la_SOURCES = \ + cpio.c depends.c formats.c fs.c fsm.c getdate.c \ + manifest.c misc.c package.c \ +--- build/Makefile.am ++++ build/Makefile.am +@@ -24,10 +24,7 @@ + pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h + noinst_HEADERS = buildio.h + +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +- +-usrlibdir = $(libdir)@MARK64@ +-usrlib_LTLIBRARIES = librpmbuild.la ++lib_LTLIBRARIES = librpmbuild.la + librpmbuild_la_SOURCES = \ + build.c expression.c files.c misc.c names.c pack.c \ + parseBuildInstallClean.c parseChangelog.c parseDescription.c \ +--- rpmdb/Makefile.am ++++ rpmdb/Makefile.am +@@ -41,11 +41,7 @@ + # 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 = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +- +-usrlibdir = $(libdir)@MARK64@ +-usrlib_LTLIBRARIES = librpmdb.la ++lib_LTLIBRARIES = librpmdb.la + librpmdb_la_SOURCES = \ + dbconfig.c fprint.c \ + hdrNVR.c header.c header_internal.c legacy.c merge.c \ +--- rpmio/Makefile.am ++++ rpmio/Makefile.am +@@ -26,10 +26,7 @@ + + BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs) + +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +- +-usrlibdir = $(libdir)@MARK64@ +-usrlib_LTLIBRARIES = librpmio.la ++lib_LTLIBRARIES = librpmio.la + librpmio_la_SOURCES = \ + argv.c digest.c fts.c macro.c rmd128.c rmd160.c rpmdav.c \ + rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \ +--- scripts/Makefile.am ++++ scripts/Makefile.am +@@ -25,7 +25,7 @@ + + all: + +-configdir = ${prefix}/lib/rpm ++configdir = $(libdir)/rpm + config_SCRIPTS = \ + brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \ + brp-strip brp-strip-comment-note brp-nobuildrootpath \ +--- tools/Makefile.am ++++ tools/Makefile.am +@@ -49,10 +49,6 @@ + #rpmdeps_LDFLAGS = $(staticLDFLAGS) + rpmdeps_LDADD = $(top_builddir)/build/librpmbuild.la + +-rpmfile.c: $(top_srcdir)/file/src/file.c +- rm -f $@ +- ln -s $< $@ +- + rpmfile_SOURCES = rpmfile.c + rpmfile_CFLAGS = -DMAGIC='"$(MAGIC)"' $(INCLUDES) + rpmfile_LDADD = $(top_builddir)/rpmio/librpmio.la diff --git a/app-arch/rpm/rpm-4.4.6.ebuild b/app-arch/rpm/rpm-4.4.6.ebuild index ca509e5f89fc..2fa924db409f 100644 --- a/app-arch/rpm/rpm-4.4.6.ebuild +++ b/app-arch/rpm/rpm-4.4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6.ebuild,v 1.7 2006/10/07 21:45:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6.ebuild,v 1.8 2006/10/08 00:36:29 vapier Exp $ inherit eutils autotools distutils perl-module @@ -10,7 +10,7 @@ SRC_URI="http://wraptastic.org/pub/rpm-4.4.x/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha -amd64 arm hppa ~ia64 ~mips ppc -ppc64 s390 sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86" IUSE="nls python perl doc sqlite" RDEPEND="=sys-libs/db-3.2* @@ -34,20 +34,17 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/rpm-4.4.6-with-sqlite.patch + epatch "${FILESDIR}"/rpm-4.4.6-stupidness.patch # the following are additional libraries that might be packaged with # the rpm sources. grep for "test -d" in configure.ac - rm -rf beecrypt elfutils neon popt sqlite zlib intl + cp file/src/{file,patchlevel}.h tools/ + rm -rf beecrypt elfutils neon popt sqlite zlib intl file sed -i -e "s:intl ::" Makefile.am sed -i -e "s:intl/Makefile ::" configure.ac AT_NO_RECURSIVE="yes" eautoreconf # TODO Get rid of internal copies of file, lua, db and db3 - # Does not work yet - #sed -i -e 's/\(\*-\*-linux\*)\tLDFLAGS_STATIC\)="[^"]*"/\1=""/' \ - # -e "s:WITH_DB_SUBDIR=db3:WITH_DB_SUBDIR=:" \ - # -e "s:WITH_INTERNAL_DB=1:WITH_INTERNAL_DB=0:" \ - # configure } src_compile() { @@ -62,8 +59,7 @@ src_compile() { $(use_with sqlite) \ $(use_enable nls) \ || die "econf failed" - - emake staticLDFLAGS="" || die "emake failed" + emake || die "emake failed" } src_install() { @@ -74,8 +70,7 @@ src_install() { use nls || rm -rf "${D}"/usr/share/man/?? - keepdir /var/lib/rpm - keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS/{noarch,i{3,4,5,6}86,athlon},BUILD} + keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} dodoc CHANGES CREDITS GROUPS README* RPM* use doc && dohtml -r apidocs/html/* |