瀏覽代碼

disable special RedHat NPTL handling for portability reasons

Ralf S. Engelschall 21 年之前
父節點
當前提交
ef1d6a6666

+ 2 - 0
openpkg/HISTORY

@@ -2,6 +2,8 @@
 2004
 ====
 
+20040721 disable special RedHat NPTL handling for portability reasons
+20040721 fixed paths in manual pages
 20040716 upgrade to OSSP uuid 1.0.1
 
 20040712 **** RELEASE AS PART OF OPENPKG 2.1.0 ***

+ 1 - 1
openpkg/local.README

@@ -4,7 +4,7 @@
   contains software which was manually installed under @l_prefix@/local/PKG/
   and activated under @l_prefix@/local/ by running:
 
-  $ @l_prefix@/sbin/lsync
+  $ @l_prefix@/bin/openpkg lsync
 
   Use "eval `@l_prefix@/etc/rc --eval all env`" from within a user's
   Bourne (Again) Shell startup script (.profile or .bashrc) in

+ 1 - 2
openpkg/openpkg.1

@@ -159,14 +159,13 @@ $ \fBopenpkg\fR \fBman\fR \fIcmd\fR
 .Ve
 .IP "Local Documentation" 4
 .IX Item "Local Documentation"
-.Vb 7
+.Vb 6
 \& openpkg-rpm(1)                RPM package manager
 \& openpkg-rpmbuild(1)           RPM package manager (build only)
 \& openpkg-rpm2cpio(1)           RPM payload utility
 \& openpkg-rpm-config(1)         RPM C API utility
 \& openpkg-lsync(1)              local area synchronization
 \& openpkg-rc(1)                 run-command facility
-\& openpkg-tools(1)              OpenPKG Tool Chain (optional)
 .Ve
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"

+ 0 - 1
openpkg/openpkg.pod

@@ -65,7 +65,6 @@ $ B<openpkg> B<man> I<cmd>
  openpkg-rpm-config(1)         RPM C API utility
  openpkg-lsync(1)              local area synchronization
  openpkg-rc(1)                 run-command facility
- openpkg-tools(1)              OpenPKG Tool Chain (optional)
 
 =back
 

+ 1 - 1
openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040716
+%define       V_openpkg  20040721
 
 #   the used software versions
 %define       V_rpm      4.2.1

+ 3 - 3
openpkg/rpm.patch.bugfix

@@ -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.
@@ -50,7 +50,7 @@ Index: build/parsePrep.c
 +---------------------------------------------------------------------------
 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
 @@ -416,7 +417,7 @@
  AC_CHECK_HEADER([beecrypt/beecrypt.h], [
  	AC_CHECK_LIB(beecrypt, mpfprintln, [
@@ -67,7 +67,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
 @@ -1274,7 +1302,6 @@
  	python/rpmdb/Makefile
  	python/test/Makefile

+ 5 - 5
openpkg/rpm.patch.feature

@@ -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.
@@ -837,7 +837,7 @@ Index: build/spec.c
 +---------------------------------------------------------------------------
 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
 @@ -53,7 +53,7 @@
  AS=${AS-as}
  AC_SUBST(AS)
@@ -871,7 +871,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
 @@ -310,7 +311,7 @@
  WITH_ZLIB_SUBDIR=
  WITH_ZLIB_INCLUDE=
@@ -889,7 +889,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
 @@ -324,38 +325,38 @@
  
  localdone=
@@ -967,7 +967,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
 @@ -1200,12 +1202,12 @@
  AC_SUBST(LOCALEDIR)
  LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"

+ 27 - 5
openpkg/rpm.patch.porting

@@ -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)

文件差異過大導致無法顯示
+ 54 - 44
openpkg/rpm.patch.regen