OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Mar-2005 16:13:12
Branch: HEAD Handle: 2005032215131100
Added files:
openpkg-src/postgresql postgresql.patch.libpqxx
Modified files:
openpkg-src/postgresql postgresql.spec
Log:
correct threaded strerror(3) problem in libpqxx, not using
strerror_r(3) with solaris since its strerror(3) is thread safe
anyways
Summary:
Revision Changes Path
1.1 +78 -0 openpkg-src/postgresql/postgresql.patch.libpqxx
1.147 +17 -3 openpkg-src/postgresql/postgresql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.patch.libpqxx
============================================================================
$ cvs diff -u -r0 -r1.1 postgresql.patch.libpqxx
--- /dev/null 2005-03-22 16:11:00 +0100
+++ postgresql.patch.libpqxx 2005-03-22 16:13:12 +0100
@@ -0,0 +1,78 @@
+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
+@@ -21337,6 +21337,7 @@
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_compile_hardcore='$CXX -pedantic-errors -c $CFLAGS $CPPFLAGS
conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+@@ -21415,18 +21416,16 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <string.h>
+- extern int strerror_r(int errnum, char *buf, size_t n);
+ int
+ main ()
+ {
+-
+- ;
++ int dico = strerror_r((int)0, (char *)0, (size_t)0);
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (eval echo "$as_me:$LINENO: \"$ac_compile_hardcore\"") >&5
++ (eval $ac_compile_hardcore) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -21465,18 +21464,16 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <string.h>
+- extern char *strerror_r(int errnum, char *buf, size_t n);
+ int
+ main ()
+ {
+-
+- ;
++ char *dico = strerror_r((int)0, (char *)0, (size_t)0);
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (eval echo "$as_me:$LINENO: \"$ac_compile_hardcore\"") >&5
++ (eval $ac_compile_hardcore) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -21516,18 +21513,16 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <string.h>
+- extern int strerror_r(int errnum, char *buf, int n);
+ int
+ main ()
+ {
+-
+- ;
++ int strerror_r((int)0, (char *)0, (int)0);
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (eval echo "$as_me:$LINENO: \"$ac_compile_hardcore\"") >&5
++ (eval $ac_compile_hardcore) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.146 -r1.147 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 21 Mar 2005 19:35:25 -0000
1.146
+++ openpkg-src/postgresql/postgresql.spec 22 Mar 2005 15:13:11 -0000
1.147
@@ -44,7 +44,7 @@
Group: Database
License: GPL
Version: %{V_postgresql}
-Release: 20050321
+Release: 20050322
# package options
%option with_server yes
@@ -69,7 +69,8 @@
Source8: rc.postgresql
Source9: pg_migrate
Patch0: postgresql.patch
-Patch1: postgresql.patch.slony1
+Patch1: postgresql.patch.libpqxx
+Patch2: postgresql.patch.slony1
# build information
Prefix: %{l_prefix}
@@ -149,6 +150,19 @@
%if "%{with_cxx}" == "yes"
%setup -q -T -D -a 1
%setup -q -T -D -a 2
+ %patch -p0 -d libpqxx-%{V_libpqxx} -P 1
+ case "%{l_platform -t}" in
+ *-sunos* )
+ %{l_shtool} subst \
+ -e 's;strerror_r(0,0,0);strerror((int)0);g' \
+ -e 's;strerror_r((int)0, (char \*)0,
(size_t)0);strerror((int)0);g' \
+ libpqxx-%{V_libpqxx}/configure
+ %{l_shtool} subst \
+ -e 's;strerror_r(err, buf, sizeof(buf));strerror(err);g' \
+ libpqxx-%{V_libpqxx}/src/largeobject.cxx \
+ libpqxx-%{V_libpqxx}/configure
+ ;;
+ esac
%endif
%if "%{with_perl}" == "yes"
%setup -q -T -D -a 3
@@ -158,7 +172,7 @@
%endif
%if "%{with_slony1}" == "yes"
%setup -q -T -D -a 5
- %patch -p0 -d slony1-%{V_slony1} -P 1
+ %patch -p0 -d slony1-%{V_slony1} -P 2
%endif
%if "%{with_pgpool}" == "yes"
%setup -q -T -D -a 6
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
