From e7f55c20f5c7ae0eac290dd7f9d3a948e1f6ab26 Mon Sep 17 00:00:00 2001 From: jbj Date: Thu, 19 Dec 2002 23:41:52 +0000 Subject: [PATCH] - add -I/usr/include/nptl, Conflicts: kernel <= 2.4.19. CVS patchset: 5950 CVS date: 2002/12/19 23:41:52 --- CHANGES | 3 +++ Makefile.am | 17 ++++++----------- configure.ac | 10 ++++++++++ po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/is.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/no.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/rpm.pot | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 4 ++-- po/sr.po | 2 +- po/sv.po | 2 +- po/tr.po | 2 +- rpm.spec.in | 23 ++++++++++++----------- rpmpopt.in | 16 ++++++++-------- rpmqv.c | 4 ++-- tools/Makefile.am | 12 +++++++----- 28 files changed, 70 insertions(+), 59 deletions(-) diff --git a/CHANGES b/CHANGES index 2cf6638..cba246e 100644 --- a/CHANGES +++ b/CHANGES @@ -57,6 +57,9 @@ - re-enable CDB locking, removing "private" from %%__dbi_cdb macro. - popt aliases for -U et al to achieve dynamic link with nptl. - add --file{class,provide,require} popt aliases and header extensions. + - statically link against /usr/lib/nptl/libpthread.a, if present. + - remove popt aliases for -U et al. + - add -I/usr/include/nptl, Conflicts: kernel <= 2.4.19. 4.0.4 -> 4.1: - loosely wire beecrypt library into rpm. diff --git a/Makefile.am b/Makefile.am index e5c28e9..07ebe95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,13 +26,13 @@ INCLUDES = \ @WITH_LIBELF_INCLUDE@ \ @INCPATH@ -myLDFLAGS = # @LDFLAGS_STATIC@ +staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@ +myLDFLAGS = # $(staticLDFLAGS) # XXX libtool can/should generate dependent libs. # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?) # XXX top_builddir ldpaths are wrong building in tree myLDADD = \ - $(top_builddir)/build/librpmbuild.la \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ @@ -43,7 +43,6 @@ myLDADD = \ @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 \ @@ -71,18 +70,14 @@ rpmpopt-$(VERSION): rpmpopt noinst_HEADERS = build.h debug.h system.h rpm_SOURCES = -rpm_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS) -rpm_LDADD = rpm.o $(whyLDADD) +rpm_LDFLAGS = $(staticLDFLAGS) +rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(whyLDADD) rpm.o: rpmqv.c $(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.c -#rpm_SOURCES = rpm.c -#rpm_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS) -#rpm_LDADD = $(myLDADD) - rpmb_SOURCES = build.c rpmb_LDFLAGS = $(myLDFLAGS) -rpmb_LDADD = rpmb.o $(myLDADD) +rpmb_LDADD = rpmb.o $(top_builddir)/build/librpmbuild.la $(myLDADD) rpmb.o: rpmqv.c $(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.c @@ -106,7 +101,7 @@ rpmk.o: rpmqv.c rpmq_SOURCES = rpmq_LDFLAGS = $(myLDFLAGS) -rpmq_LDADD = rpmq.o $(myLDADD) +rpmq_LDADD = rpmq.o $(top_builddir)/build/librpmbuild.la $(myLDADD) rpmq.o: rpmqv.c $(COMPILE) -DIAM_RPMQV -o $@ -c rpmqv.c diff --git a/configure.ac b/configure.ac index 7e530a9..69f192d 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,16 @@ AC_MSG_RESULT($LDFLAGS_STATIC) AC_SUBST(LDFLAGS_STATIC) dnl +dnl XXX Test for libpthread.a that is NPTL aware. +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 +AC_SUBST(LDFLAGS_NPTL) + +dnl dnl look for POSIX chmod attributes dnl AC_MSG_CHECKING(POSIX chmod) diff --git a/po/cs.po b/po/cs.po index baabe49..bf0a328 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index c8d747b..5402bb8 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 799abd7..4665265 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" diff --git a/po/fi.po b/po/fi.po index 474d63e..13e4346 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 7868c83..212da1a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/gl.po b/po/gl.po index c964a8e..0c33707 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" diff --git a/po/is.po b/po/is.po index 1c9497a..e836b66 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" diff --git a/po/ja.po b/po/ja.po index 8f59d11..cd19101 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" diff --git a/po/ko.po b/po/ko.po index 31ef6c8..0e204f5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" diff --git a/po/no.po b/po/no.po index 128c93c..6021480 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" diff --git a/po/pl.po b/po/pl.po index 7d26b90..0c0e3af 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index cb9ed93..be963ce 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt \n" "Language-Team: Romanian \n" diff --git a/po/rpm.pot b/po/rpm.pot index d793025..3a823a9 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ru.po b/po/ru.po index 698f30c..5f5350a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" diff --git a/po/sk.po b/po/sk.po index f7bed2a..64e73e9 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index d785eea..547acfd 100644 --- a/po/sl.po +++ b/po/sl.po @@ -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 , 2000. -# $Id: sl.po,v 1.338 2002/12/18 23:00:36 jbj Exp $ +# $Id: sl.po,v 1.339 2002/12/19 23:42:37 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" diff --git a/po/sr.po b/po/sr.po index 2917cfc..eefe5bd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sv.po b/po/sv.po index 91efc70..d2845ef 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2002-08-19 22:26+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index eb57e3c..7ea6137 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-18 17:59-0500\n" +"POT-Creation-Date: 2002-12-19 18:36-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" diff --git a/rpm.spec.in b/rpm.spec.in index 519bce9..881fb10 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -2,7 +2,6 @@ %define with_python_version @WITH_PYTHON_VERSION@%{nil} %define with_bzip2 @WITH_BZIP2@%{nil} %define with_apidocs @WITH_APIDOCS@%{nil} -%define with_internal_db @WITH_INTERNAL_DB@%{nil} # XXX legacy requires './' payload prefix to be omitted from rpm packages. %define _noPayloadPrefix 1 @@ -17,7 +16,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.29nptl +Release: 0.31 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -28,17 +27,14 @@ Prereq: gawk fileutils textutils mktemp shadow-utils Requires: popt = 1.8 Obsoletes: rpm-perl < %{version} -# XXX necessary only to drag in /usr/lib/libelf.a -BuildRequires: elfutils-devel >= 0.63 +# XXX necessary only to drag in /usr/lib/libelf.a, otherwise internal elfutils. +BuildRequires: elfutils-libelf -%if !%{with_internal_db} -BuildRequires: db3-devel -%endif - -# XXX /dev/futex support needed: +# XXX /dev/futex kernel support needed: +Conflicts: kernel <= 2.4.19 Requires: kernel >= 2.4.20-0.pp.9 -# XXX NPTL support needed. +# XXX NPTL glibc support needed. Requires: glibc >= 2.3.1-16nptl BuildRequires: zlib-devel @@ -461,9 +457,14 @@ exit 0 %{__prefix}/include/popt.h %changelog +* Thu Dec 19 2002 Jeff Johnson 4.2-0.31 +- statically link against /usr/lib/nptl/libpthread.a, if present. +- remove popt aliases for -U et al. +- add -I/usr/include/nptl, Conflicts: kernel <= 2.4.19. + * Wed Dec 18 2002 Jeff Johnson 4.2-0.29nptl - popt aliases for -U et al to achieve dynamic link with nptl. -- add --file{class,provide,require} popt aliases and header extensions +- add --file{class,provide,require} popt aliases and header extensions. * Tue Dec 17 2002 Jeff Johnson 4.2-0.28nptl - re-enable CDB locking, removing "private" from %%__dbi_cdb macro. diff --git a/rpmpopt.in b/rpmpopt.in index adbcaad..f9bc8af 100644 --- a/rpmpopt.in +++ b/rpmpopt.in @@ -187,14 +187,14 @@ rpm exec -V rpmv -V rpm exec -y rpmv -y rpm exec --verify rpmv --verify -rpm exec -i rpmi -i -rpm exec --install rpmi --install -rpm exec -U rpmi -U -rpm exec --upgrade rpmi --upgrade -rpm exec -F rpmi -F -rpm exec --freshen rpmi --freshen -rpm exec -e rpmi -e -rpm exec --erase rpmi --erase +#rpm exec -i rpmi -i +#rpm exec --install rpmi --install +#rpm exec -U rpmi -U +#rpm exec --upgrade rpmi --upgrade +#rpm exec -F rpmi -F +#rpm exec --freshen rpmi --freshen +#rpm exec -e rpmi -e +#rpm exec --erase rpmi --erase rpm alias --with --define "_with_!#:+ --with-!#:+" \ --POPTdesc=$"enable configure