Forráskód Böngészése

remove Oid typedef tests until the authors correctly implement them

Michael Schloh von Bennewitz 20 éve
szülő
commit
3616d88b21
2 módosított fájl, 69 hozzáadás és 1 törlés
  1. 68 0
      postgresql/postgresql.patch.libpqxx
  2. 1 1
      postgresql/postgresql.spec

+ 68 - 0
postgresql/postgresql.patch.libpqxx

@@ -2,6 +2,74 @@ Index: configure
 diff -Nau configure.orig configure
 --- configure.orig	2005-03-19 14:31:37.000000000 +0100
 +++ configure	2005-03-22 14:17:46.925800594 +0100
+@@ -21272,67 +21272,6 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-
+-
+-# TODO: Adapt automatically somehow...
+-echo "$as_me:$LINENO: checking that type of libpq's Oid is as expected" >&5
+-echo $ECHO_N "checking that type of libpq's Oid is as expected... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include<${with_postgres_include}/libpq-fe.h>
+-	#include<pqxx/libpq-forward.hxx>
+-int
+-main ()
+-{
+-typedef pqxx::oid Oid
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 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); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  { { echo "$as_me:$LINENO: error:
+-The Oid typedef in libpq has changed.  Please notify the libpqxx authors of the
+-change!
+-" >&5
+-echo "$as_me: error:
+-The Oid typedef in libpq has changed.  Please notify the libpqxx authors of the
+-change!
+-" >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-
+-
+ # Check presence and version of strerror_r()
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
 @@ -21337,6 +21337,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'

+ 1 - 1
postgresql/postgresql.spec

@@ -44,7 +44,7 @@ Class:        BASE
 Group:        Database
 License:      GPL
 Version:      %{V_postgresql}
-Release:      20050322
+Release:      20050323
 
 #   package options
 %option       with_server    yes