folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- link rpm libraries together, use shared helpers with external -lelf. 

- move libfmagic to librpmio.
- use libtool-1.4.3, autoconf-2.56.
- add explicit -L/lib64 -L/usr/lib64 for libtool mode=relink on x86_64.

CVS patchset: 5910
CVS date: 2002/12/01 18:03:22
This commit is contained in:
jbj 2002-12-01 18:03:22 +00:00
parent 5dfaaf855c
commit 0efbbada0f
35 changed files with 88 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -34,6 +34,10 @@
- add -g to all platforms optflags.
- build with external elfutils (preferred), if available.
- upgrade to elfutils-0.63.
- link rpm libraries together, use shared helpers with external -lelf.
- move libfmagic to librpmio.
- use libtool-1.4.3, autoconf-2.56.
- add explicit -L/lib64 -L/usr/lib64 for libtool mode=relink on x86_64.
4.0.4 -> 4.1:
- loosely wire beecrypt library into rpm.

13
Makefile.am
View File

@ -42,6 +42,17 @@ myLDADD = \
@INTLLIBS@ \
@LIBMISC@
whyLDADD = \
$(top_builddir)/build/.libs/librpmbuild.a \
$(top_builddir)/lib/.libs/librpm.a \
$(top_builddir)/rpmdb/.libs/librpmdb.a \
$(top_builddir)/rpmio/.libs/librpmio.a \
$(top_builddir)/popt/.libs/libpopt.a \
@WITH_LIBELF_LIB@ \
@WITH_ZLIB_LIB@ \
@INTLLIBS@ \
@LIBMISC@
rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
rpmbin_PROGRAMS = rpm
@ -61,7 +72,7 @@ noinst_HEADERS = build.h debug.h system.h
rpm_SOURCES =
rpm_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS)
rpm_LDADD = rpm.o $(myLDADD)
rpm_LDADD = rpm.o $(whyLDADD)
rpm.o: rpmqv.c
$(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.c

8
autogen.sh
View File

@ -3,13 +3,13 @@
export CFLAGS
export LDFLAGS
LTV="libtoolize (GNU libtool) 1.4.2"
ACV="autoconf (GNU Autoconf) 2.54"
LTV="libtoolize (GNU libtool) 1.4.3"
ACV="autoconf (GNU Autoconf) 2.56"
AMV="automake (GNU automake) 1.6.3"
USAGE="
This script documents the versions of the tools I'm using to build rpm:
libtool-1.4.2
autoconf-2.54
libtool-1.4.3
autoconf-2.56
automake-1.6.3
Simply edit this script to change the libtool/autoconf/automake versions
checked if you need to, as rpm should build (and has built) with all

8
beecrypt/autogen.sh
View File

@ -3,13 +3,13 @@
export CFLAGS
export LDFLAGS
LTV="libtoolize (GNU libtool) 1.4.2"
ACV="autoconf (GNU Autoconf) 2.54"
LTV="libtoolize (GNU libtool) 1.4.3"
ACV="autoconf (GNU Autoconf) 2.56"
AMV="automake (GNU automake) 1.6.3"
USAGE="
This script documents the versions of the tools I'm using to build rpm:
libtool-1.4.2
autoconf-2.54
libtool-1.4.3
autoconf-2.56
automake-1.6.3
Simply edit this script to change the libtool/autoconf/automake versions
checked if you need to, as rpm should build (and has built) with all

26
build/Makefile.am
View File

@ -15,7 +15,7 @@ INCLUDES = -I. \
LIBS =
FILELOBJS = $(shell cat $(top_builddir)/file/listobjs)
#FILELOBJS = $(shell cat $(top_builddir)/file/listobjs)
pkgincdir = $(pkgincludedir)
pkginc_HEADERS = argv.h rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
@ -27,26 +27,26 @@ librpmbuild_la_SOURCES = \
parseBuildInstallClean.c parseChangelog.c parseDescription.c \
parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c
librpmbuild_la_LDFLAGS = -release @VERSION@
librpmbuild_la_LIBADD = $(FILELOBJS)
librpmbuild_la_DEPENDENCIES = .created
librpmbuild_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/lib/librpm.la
#librpmbuild_la_LIBADD = $(FILELOBJS)
#librpmbuild_la_DEPENDENCIES = .created
rpmfile.h:
@ln -sf $(top_builddir)/file/file.h $@
$(top_builddir)/file/listobjs:
${MAKE} -C $(top_builddir)/file listobjs
.created: rpmfile.h $(top_builddir)/file/listobjs
for lo in $(FILELOBJS); do \
[ -f $$lo ] || $(LN_S) $(top_builddir)/file/$$lo $$lo ; \
done
touch $@
#$(top_builddir)/file/listobjs:
# ${MAKE} -C $(top_builddir)/file listobjs
#
#.created: rpmfile.h $(top_builddir)/file/listobjs
# for lo in $(FILELOBJS); do \
# [ -f $$lo ] || $(LN_S) $(top_builddir)/file/$$lo $$lo ; \
# done
# touch $@
rpmfc.c: rpmfile.h
clean-local:
rm -f $(FILELOBJS) *.o .created rpmfile.h
rm -f *.o rpmfile.h # .created $(FILELOBJS)
# XXX Add internal libtool dependence
install-data-local:

12
configure.ac
View File

@ -371,7 +371,7 @@ AC_CHECK_HEADER([gelf.h], [
AC_DEFINE(HAVE_GELF_H, 1, [Define to 1 if you have the <gelf.h> header file.])
AC_CHECK_LIB(elf, gelf_getvernaux, [
AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the `elf' library (-lelf).])
WITH_LIBELF_LIB="/usr/lib/libelf.a"
WITH_LIBELF_LIB="-lelf"
])
], [
if test -d elfutils/libelf ; then
@ -388,7 +388,7 @@ AC_SUBST(WITH_LIBELF_LIB)
WITH_LIBDWARF_INCLUDE=
AC_CHECK_HEADER([dwarf.h], [
AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
], [
if test -d elfutils/libdwarf ; then
AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
@ -1105,6 +1105,14 @@ else
ln -s ${srcdir}/autodeps/none ./find-requires
fi
dnl XXX hack in explicit -L/lib64 -L/usr/lib64 on x86_64
HACK_LIBTOOLPATH=
case "${build_cpu}" in
x86_64*) HACK_LIBTOOLPATH="-L/lib64 -L/usr/lib64" ;;
esac
AC_SUBST(HACK_LIBTOOLPATH)
dnl Determine the canonical arch-vendor-os for the build machine
case "${build_cpu}" in
*86) RPMCANONARCH=i386 ;;

8
file/autogen.sh
View File

@ -3,13 +3,13 @@
export CFLAGS
export LDFLAGS
LTV="libtoolize (GNU libtool) 1.4.2"
ACV="autoconf (GNU Autoconf) 2.54"
LTV="libtoolize (GNU libtool) 1.4.3"
ACV="autoconf (GNU Autoconf) 2.56"
AMV="automake (GNU automake) 1.6.3"
USAGE="
This script documents the versions of the tools I'm using to build rpm:
libtool-1.4.2
autoconf-2.54
libtool-1.4.3
autoconf-2.56
automake-1.6.3
Simply edit this script to change the libtool/autoconf/automake versions
checked if you need to, as rpm should build (and has built) with all

2
lib/Makefile.am
View File

@ -39,7 +39,7 @@ librpm_la_SOURCES = \
rpmlead.c rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c rpmvercmp.c \
signature.c stringbuf.c transaction.c \
verify.c
librpm_la_LDFLAGS = -release @VERSION@
librpm_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/rpmdb/librpmdb.la
# XXX Add internal libtool dependence
install-data-local:

2
po/cs.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2001-07-24 10:02+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"

2
po/da.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2001-04-05 23:03GMT\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"

2
po/de.po
View File

@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"

2
po/fi.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"

2
po/fr.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
po/gl.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2001-01-13 22:31+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"

2
po/is.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2001-07-12 13:25+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"

2
po/ja.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"

2
po/ko.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.4\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2002-03-04 17:17+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"

2
po/no.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2001-06-27 12:24+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"

2
po/pl.po
View File

@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 1999-05-25 17:00+0100\n"
"Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
"Language-Team: Polish <pl@li.org>\n"

2
po/pt.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2002-02-14 10:51+0000\n"
"Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
"Language-Team: pt <morais@kde.org\n"

2
po/pt_BR.po
View File

@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"

2
po/ro.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 1999-04-10 12:00+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"

2
po/rpm.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
po/ru.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2002-08-27 13:36-0400\n"
"Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"

2
po/sk.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"

4
po/sl.po
View File

@ -1,12 +1,12 @@
# -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
# Copyright (C) 2000 Free Software Foundation, Inc.
# Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
# $Id: sl.po,v 1.327 2002/11/29 21:36:31 jbj Exp $
# $Id: sl.po,v 1.328 2002/12/01 18:04:09 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2000-10-08 19:05+0200\n"
"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
"Language-Team: Slovenian <sl@li.org>\n"

2
po/sr.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"

2
po/sv.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.1\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2002-08-19 22:26+0200\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"

2
po/tr.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-11-29 16:35-0500\n"
"POT-Creation-Date: 2002-12-01 10:35-0500\n"
"PO-Revision-Date: 2001-07-05 08:02+300\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"

3
python/Makefile.am
View File

@ -25,7 +25,8 @@ mylibs= \
$(top_builddir)/lib/.libs/librpm.so \
$(top_builddir)/rpmdb/.libs/librpmdb.so \
$(top_builddir)/rpmio/.libs/librpmio.so \
$(top_builddir)/popt/.libs/libpopt.so
$(top_builddir)/popt/.libs/libpopt.so \
@WITH_LIBELF_LIB@
LDADD =

8
rpm.spec.in
View File

@ -16,7 +16,7 @@ Name: rpm
%define version @VERSION@
Version: %{version}
%{expand: %%define rpm_version %{version}}
Release: 0.14
Release: 0.15
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@ -496,6 +496,12 @@ exit 0
%{__prefix}/include/popt.h
%changelog
* Sun Dec 1 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.15
- link rpm libraries together, use shared helpers with external -lelf.
- move libfmagic to librpmio.
- use libtool-1.4.3, autoconf-2.56.
- add explicit -L/lib64 -L/usr/lib64 for libtool mode=relink on x86_64.
* Sat Nov 30 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.14
- upgrade to elfutils-0.63.

2
rpmdb/Makefile.am
View File

@ -41,7 +41,7 @@ librpmdb_la_SOURCES = \
hdrNVR.c header.c header_internal.c legacy.c merge.c \
poptDB.c rpmhash.c rpmdb.c \
tagname.c tagtbl.c
librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@
librpmdb_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la @WITH_LIBELF_LIB@ @libdb3@
librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created

2
rpmio/Makefile.am
View File

@ -26,7 +26,7 @@ lib_LTLIBRARIES = librpmio.la
librpmio_la_SOURCES = digest.c fts.c macro.c \
rpmio.c rpmlog.c rpmmalloc.c \
rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c
librpmio_la_LDFLAGS = -release @VERSION@ @WITH_ZLIB_LIB@ -lrt -lpthread
librpmio_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/file/libfmagic.la @WITH_ZLIB_LIB@ -lrt -lpthread
librpmio_la_LIBADD = $(BEECRYPTLOBJS)
librpmio_la_DEPENDENCIES = .created

1
rpmio/rpmrpc.c
View File

@ -9,7 +9,6 @@
#endif
#include <rpmio_internal.h>
#include <popt.h>
#include "ugid.h"
#include "debug.h"

6
tools/Makefile.am
View File

@ -42,13 +42,13 @@ debugedit_SOURCES = debugedit.c hashtab.c
javadeps_SOURCES = javadeps.c
rpmcache_SOURCES = rpmcache.c
rpmcache_LDFLAGS = @LDFLAGS_STATIC@
#rpmcache_LDFLAGS = @LDFLAGS_STATIC@
rpmdeps_SOURCES = rpmdeps.c
rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(top_builddir)/file/libfmagic.la
#rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(top_builddir)/file/libfmagic.la
rpmgraph_SOURCES = rpmgraph.c
rpmgraph_LDFLAGS = @LDFLAGS_STATIC@
#rpmgraph_LDFLAGS = @LDFLAGS_STATIC@
rpminject_SOURCES = rpminject.c
rpminject_LDFLAGS = @LDFLAGS_STATIC@