OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Sep-2003 18:59:49
Branch: HEAD Handle: 2003091217594801
Modified files:
openpkg-src/openpkg rpm.patch.bugfix rpm.patch.regen
Log:
Fix INCPATH checks by replacing an incorrect (because unescaped)
"[...]" construct with the usual m4 workaround using an explicit
"test" construct.
Summary:
Revision Changes Path
1.18 +19 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.17 +10 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.17 -r1.18 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 12 Sep 2003 11:54:41 -0000 1.17
+++ openpkg-src/openpkg/rpm.patch.bugfix 12 Sep 2003 16:59:48 -0000 1.18
@@ -43,12 +43,30 @@
}
+---------------------------------------------------------------------------
+| Fix INCPATH checks by replacing an incorrect (because unescaped)
+| "[...]" construct with the usual m4 workaround using an explicit
+| "test" construct.
++---------------------------------------------------------------------------
+Index: configure.ac
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
++++ configure.ac 12 Sep 2003 15:10:58 -0000
+@@ -348,7 +349,7 @@
+
+ AC_MSG_CHECKING(for $dir/include in INCPATH)
+ if test -d $dir/include 2>/dev/null ; then
+- if [ "$dir" != "/usr/local" ] ; then
++ if test "$dir" != "/usr/local"; then
+ INCPATH="$INCPATH -I$dir/include"
+ fi
+ AC_MSG_RESULT(yes)
+
++---------------------------------------------------------------------------
| Remove access to not-existing beecrypt/ subdirectory
| to avoid the configure script to break building.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 1 Sep 2003 09:26:45 -0000
++++ configure.ac 12 Sep 2003 15:10:58 -0000
@@ -1274,7 +1298,6 @@
python/rpmdb/Makefile
python/test/Makefile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.16 -r1.17 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 12 Sep 2003 11:54:41 -0000 1.16
+++ openpkg-src/openpkg/rpm.patch.regen 12 Sep 2003 16:59:49 -0000 1.17
@@ -56,7 +56,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 1 Sep 2003 09:26:56 -0000
++++ configure 12 Sep 2003 15:11:28 -0000
@@ -4040,7 +4040,7 @@
AS=${AS-as}
@@ -128,6 +128,15 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
+@@ -11312,7 +11313,7 @@
+ echo "$as_me:$LINENO: checking for $dir/include in INCPATH" >&5
+ echo $ECHO_N "checking for $dir/include in INCPATH... $ECHO_C" >&6
+ if test -d $dir/include 2>/dev/null ; then
+- if "$dir" != "/usr/local" ; then
++ if test "$dir" != "/usr/local"; then
+ INCPATH="$INCPATH -I$dir/include"
+ fi
+ echo "$as_me:$LINENO: result: yes" >&5
@@ -22911,6 +22912,86 @@
else
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
