|
|
@@ -10,7 +10,7 @@
|
|
|
## 'patch' tool to upgrade those files. Each patch snippet is annotated
|
|
|
## with a short description.
|
|
|
##
|
|
|
-## Created on: 04-Jun-2004
|
|
|
+## Created on: 21-Jul-2004
|
|
|
##
|
|
|
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
|
|
|
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
|
|
|
@@ -32,13 +32,35 @@ Index: ltconfig
|
|
|
|
|
|
openbsd*)
|
|
|
|
|
|
++---------------------------------------------------------------------------
|
|
|
+| Disable special RedHat NPTL handling.
|
|
|
++---------------------------------------------------------------------------
|
|
|
+Index: configure.ac
|
|
|
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
|
|
|
++++ configure.ac 21 Jul 2004 11:16:59 -0000
|
|
|
+@@ -150,10 +151,10 @@
|
|
|
+ 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
|
|
|
++dnl if test -f /usr/lib/nptl/libpthread.a ; then
|
|
|
++dnl LDFLAGS_NPTL="-L/usr/lib/nptl"
|
|
|
++dnl # INCPATH="$INCPATH -I/usr/include/nptl"
|
|
|
++dnl fi
|
|
|
+ AC_SUBST(LDFLAGS_NPTL)
|
|
|
+
|
|
|
+ dnl
|
|
|
+
|
|
|
+---------------------------------------------------------------------------
|
|
|
| Disable any POSIX Pthread stuff because in OpenPKG we use
|
|
|
| non-Pthread mutexes in Berkeley-DB.
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: configure.ac
|
|
|
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
|
|
|
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
|
|
|
++++ configure.ac 21 Jul 2004 11:16:59 -0000
|
|
|
@@ -446,14 +447,17 @@
|
|
|
AC_CHECK_LIB(socket, socket)
|
|
|
])
|
|
|
@@ -70,7 +92,7 @@ Index: configure.ac
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: configure.ac
|
|
|
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
|
|
|
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
|
|
|
++++ configure.ac 21 Jul 2004 11:16:59 -0000
|
|
|
@@ -963,12 +967,13 @@
|
|
|
AC_CHECK_FUNCS(getpassphrase)
|
|
|
|
|
|
@@ -93,7 +115,7 @@ Index: configure.ac
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: configure.ac
|
|
|
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
|
|
|
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
|
|
|
++++ configure.ac 21 Jul 2004 11:16:59 -0000
|
|
|
@@ -1141,9 +1146,6 @@
|
|
|
|
|
|
dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
|
|
|
@@ -115,7 +137,7 @@ Index: configure.ac
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: configure.ac
|
|
|
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
|
|
|
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
|
|
|
++++ configure.ac 21 Jul 2004 11:16:59 -0000
|
|
|
@@ -1249,11 +1251,37 @@
|
|
|
|
|
|
AC_SUBST(OBJDUMP)
|