OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jun-2004 18:11:39
Branch: HEAD Handle: 2004060417113800
Modified files:
openpkg-src/sqlite sqlite.patch sqlite.spec
Log:
use a substitution instead of a patch for future maintenance
Summary:
Revision Changes Path
1.3 +3 -240 openpkg-src/sqlite/sqlite.patch
1.60 +3 -0 openpkg-src/sqlite/sqlite.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 sqlite.patch
--- openpkg-src/sqlite/sqlite.patch 4 Jun 2004 14:47:49 -0000 1.2
+++ openpkg-src/sqlite/sqlite.patch 4 Jun 2004 16:11:38 -0000 1.3
@@ -1,244 +1,7 @@
Index: configure
---- configure.orig 2004-03-02 19:36:54.000000000 +0100
-+++ configure 2004-06-04 16:44:55.023183512 +0200
-@@ -4179,236 +4179,6 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
--ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
--if test -z "$CXXCPP"; then
-- if test "${ac_cv_prog_CXXCPP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- # Double quotes because CXXCPP needs to be expanded
-- for CXXCPP in "$CXX -E" "/lib/cpp"
-- do
-- ac_preproc_ok=false
--for ac_cxx_preproc_warn_flag in '' yes
--do
-- # Use a header file that comes with gcc, so configuring glibc
-- # with a fresh cross-compiler works.
-- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- # <limits.h> exists even on freestanding compilers.
-- # On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp. "Syntax error" is here to catch this case.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-- Syntax error
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.$ac_ext
--
-- # OK, works on sane cases. Now check whether non-existent headers
-- # can be detected and how.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <ac_nonexistent.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- # Broken: success on invalid input.
--continue
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- # Passes both tests.
--ac_preproc_ok=:
--break
--fi
--rm -f conftest.err conftest.$ac_ext
--
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
-- break
--fi
--
-- done
-- ac_cv_prog_CXXCPP=$CXXCPP
--
--fi
-- CXXCPP=$ac_cv_prog_CXXCPP
--else
-- ac_cv_prog_CXXCPP=$CXXCPP
--fi
--echo "$as_me:$LINENO: result: $CXXCPP" >&5
--echo "${ECHO_T}$CXXCPP" >&6
--ac_preproc_ok=false
--for ac_cxx_preproc_warn_flag in '' yes
--do
-- # Use a header file that comes with gcc, so configuring glibc
-- # with a fresh cross-compiler works.
-- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- # <limits.h> exists even on freestanding compilers.
-- # On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp. "Syntax error" is here to catch this case.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-- Syntax error
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.$ac_ext
--
-- # OK, works on sane cases. Now check whether non-existent headers
-- # can be detected and how.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <ac_nonexistent.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- # Broken: success on invalid input.
--continue
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- # Passes both tests.
--ac_preproc_ok=:
--break
--fi
--rm -f conftest.err conftest.$ac_ext
--
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
-- :
--else
-- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
-
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-@@ -20450,7 +20220,10 @@
+--- configure.orig 2004-06-03 13:36:27.000000000 +0200
++++ configure 2004-06-03 13:39:37.000000000 +0200
+@@ -20450,7 +20450,10 @@
TARGET_HAVE_READLINE=0
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.spec
============================================================================
$ cvs diff -u -r1.59 -r1.60 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec 4 Jun 2004 14:47:49 -0000 1.59
+++ openpkg-src/sqlite/sqlite.spec 4 Jun 2004 16:11:38 -0000 1.60
@@ -77,6 +77,9 @@
%prep
%setup -q -n sqlite
+ %{l_shtool} subst \
+ -e '/LINENO: error: C\+\+ preprocessor/{N;N;N;N;s/.*/:/;}' \
+ configure
chmod a+x install-sh
%patch -p0
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
