- dynamically link /bin/rpm, link against good old -lpthread.

CVS patchset: 5951
CVS date: 2002/12/20 15:03:18

diff --git a/CHANGES b/CHANGES
index cba246e..7cd5f53 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -59,7 +59,8 @@
        - 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.
+       - add -I/usr/include/nptl, Conflicts: kernel < 2.4.20.
+       - dynamically link /bin/rpm, link against good old -lpthread.
 
 4.0.4 -> 4.1:
        - loosely wire beecrypt library into rpm.

diff --git a/Makefile.am b/Makefile.am
index 07ebe95..d66bfa4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,7 +70,7 @@ rpmpopt-$(VERSION): rpmpopt
 noinst_HEADERS = build.h debug.h system.h
 
 rpm_SOURCES =
-rpm_LDFLAGS =          $(staticLDFLAGS)
+rpm_LDFLAGS =          $(myLDFLAGS)
 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

diff --git a/autogen.sh b/autogen.sh
index 898e8f5..1ffd855 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -55,7 +55,12 @@ if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
        mandir=/usr/man
        infodir=/usr/info
     fi
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} "$@"
+    if [ -d /usr/lib/nptl ]; then
+       enable_posixmutexes="--enable-posixmutexes"
+    else
+       enable_posixmutexes=
+    fi
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} ${enable_posixmutexes} "$@"
 else
     ./configure "$@"
 fi

diff --git a/configure.ac b/configure.ac
index 69f192d..fde2791 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -144,13 +144,13 @@ AC_MSG_RESULT($LDFLAGS_STATIC)
 AC_SUBST(LDFLAGS_STATIC)
 
 dnl
-dnl XXX Test for libpthread.a that is NPTL aware.
+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/lib/nptl/libpthread.a ; then
+#    LDFLAGS_NPTL="-L/usr/lib/nptl"
+#    INCPATH="$INCPATH -I/usr/include/nptl"
+#fi
 AC_SUBST(LDFLAGS_NPTL)
 
 dnl

diff --git a/db3/configure b/db3/configure
index 5f287fc..3c2f6f8 100755 (executable)
--- a/db3/configure
+++ b/db3/configure
@@ -8,7 +8,7 @@ rm -f config.cache
 ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`"
 
 CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
-       --enable-shared --enable-static --enable-rpc --enable-posixmutexes \
+       --enable-shared --enable-static --enable-rpc \
        --with-uniquename=_rpmdb --srcdir=$db_dist
 
 mv Makefile Makefile.orig

diff --git a/rpm.spec.in b/rpm.spec.in
index 881fb10..d5277ac 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -16,7 +16,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.31
+Release: 0.32
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -31,10 +31,9 @@ Obsoletes: rpm-perl < %{version}
 BuildRequires: elfutils-libelf
 
 # XXX /dev/futex kernel support needed:
-Conflicts: kernel <= 2.4.19
-Requires: kernel >= 2.4.20-0.pp.9
+Conflicts: kernel < 2.4.20
 
-# XXX NPTL glibc support needed.
+# XXX NPTL glibc support needed:
 Requires: glibc >= 2.3.1-16nptl
 
 BuildRequires: zlib-devel
@@ -457,10 +456,13 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Fri Dec 20 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.32
+- dynamically link /bin/rpm, link against good old -lpthread.
+
 * Thu Dec 19 2002 Jeff Johnson <jbj@redhat.com> 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.
+- add -I/usr/include/nptl, Conflicts: kernel < 2.4.20.
 
 * Wed Dec 18 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.29nptl
 - popt aliases for -U et al to achieve dynamic link with nptl.

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4ff28ef..1141e18 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -50,9 +50,9 @@ rpmgraph_SOURCES =    rpmgraph.c
 #rpmgraph_LDFLAGS =    $(staticLDFLAGS)
 
 rpminject_SOURCES =    rpminject.c
-rpminject_LDFLAGS =    $(staticLDFLAGS)
+#rpminject_LDFLAGS =   $(staticLDFLAGS)
 
 rpmsort_SOURCES =      rpmsort.c
-rpmsort_LDFLAGS =      $(staticLDFLAGS)
+#rpmsort_LDFLAGS =     $(staticLDFLAGS)
 
 $(PROGRAMS): $(LDADD)