Folks,
Please find enclosed a patch to get Slony 2.0.3 to compile on OS/X :)
Cheers,
David.
--
David Fetter <[email protected]> http://fetter.org/
Phone: +1 415 235 3778 AIM: dfetter666 Yahoo!: dfetter
Skype: davidfetter XMPP: [email protected]
iCal: webcal://www.tripit.com/feed/ical/people/david74/tripit.ics
Remember to vote!
Consider donating to Postgres: http://www.postgresql.org/about/donate
--- Begin Message ---
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This is actually mixing 2 things, technically.
1) autoconf 2.6 errored out on the AC_DEFINE(FOO) style define, they now
require you to define a value and description.
2) Check for size_t, if it exists, define it to be used in .y files, if
not, set it to "int" to work the old way.
The original compile error was:
> scan.c:161: error: conflicting types for ?yyleng?
> parser.y:25: error: previous declaration of ?yyleng? was here
The bison-generated .c file uses yy_size_t which is typedef'd to size_t
for yyleng. (an unsigned long). parser.y from slony uses an int, though.
Thanks!
- --
Benjamin Reed a.k.a. Ranger Rick a.k.a. Raccoon Fink
Fink, KDE, and Mac OS X development
Blog: http://www.raccoonfink.com/
Music: http://music.raccoonfink.com/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.12 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iD8DBQFL0cRHUu+jZtP2Zf4RAsnSAJ4maF/yIT91PJpthfhIu8vrCNReeACdFJ4m
R3rBemZQat1rugKfwf+kMqM=
=7d4U
-----END PGP SIGNATURE-----
diff -Nurd slony1-2.0.3/config/acx_libpq.m4
slony1-2.0.3-patched/config/acx_libpq.m4
--- slony1-2.0.3/config/acx_libpq.m4 2010-04-06 16:12:14.000000000 -0400
+++ slony1-2.0.3-patched/config/acx_libpq.m4 2010-04-23 11:53:34.000000000
-0400
@@ -397,11 +397,11 @@
AC_MSG_RESULT(no)
else
if test "$ac_cv_typenameTypeId_args" = 3; then
- AC_DEFINE(HAVE_TYPENAMETYPEID_3)
+ AC_DEFINE(HAVE_TYPENAMETYPEID_3,1,[typenameTypeId has 3 arguments])
elif test "$ac_cv_typenameTypeId_args" = 2; then
- AC_DEFINE(HAVE_TYPENAMETYPEID_2)
+ AC_DEFINE(HAVE_TYPENAMETYPEID_2,1,[typenameTypeId has 2 arguments])
elif test "$ac_cv_typenameTypeId_args" = 1; then
- AC_DEFINE(HAVE_TYPENAMETYPEID_1)
+ AC_DEFINE(HAVE_TYPENAMETYPEID_1,1,[typenameTypeId has 1 argument])
fi
AC_MSG_RESULT([yes, and it takes $ac_cv_typenameTypeId_args arguments])
fi
@@ -410,7 +410,7 @@
AC_EGREP_HEADER(GetActiveSnapshot,
utils/snapmgr.h,
[AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_GETACTIVESNAPSHOT)],
+ AC_DEFINE(HAVE_GETACTIVESNAPSHOT,1,[GetActiveSnapshot in
utils/snapmgr.h])],
AC_MSG_RESULT(no)
)
@@ -419,9 +419,9 @@
AC_MSG_RESULT(no)
else
if test "$ac_cv_ScanKeywordLookup_args" = 1; then
- AC_DEFINE(SCANKEYWORDLOOKUP_1)
+ AC_DEFINE(SCANKEYWORDLOOKUP_1,1,[ScanKeyWordLookup has 1 argument])
elif test "$ac_cv_ScanKeywordLookup_args" = 3; then
- AC_DEFINE(SCANKEYWORDLOOKUP_3)
+ AC_DEFINE(SCANKEYWORDLOOKUP_3,1,[ScanKeyWordLookup has 3 arguments])
fi
AC_MSG_RESULT([yes, and it takes $ac_cv_ScanKeywordLookup_args arguments])
fi
@@ -431,7 +431,7 @@
AC_EGREP_HEADER(standard_conforming_strings,
parser/gramparse.h,
[AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_STANDARDCONFORMINGSTRINGS)],
+ AC_DEFINE(HAVE_STANDARDCONFORMINGSTRINGS,1,[standard_conforming_strings
in parser/gramparse.h])],
AC_MSG_RESULT(no)
)
fi
diff -Nurd slony1-2.0.3/configure.ac slony1-2.0.3-patched/configure.ac
--- slony1-2.0.3/configure.ac 2010-04-09 16:29:09.000000000 -0400
+++ slony1-2.0.3-patched/configure.ac 2010-04-23 11:53:29.000000000 -0400
@@ -15,6 +15,8 @@
sed -e 's/\:\ REL_//' -e 's/\$//g' -e 's/_/./g' -e 's/\./\_/3' \
-e 's/\ //g' -e s/\:/`date +HEAD_%Y%m%d`/ | tr -d '\n']))
+m4_pattern_allow([^SLON_AC_])
+
AC_INIT(slony1,[SLONREL_VERSION])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_AUX_DIR(config)
@@ -119,9 +121,15 @@
AC_CHECK_TYPES([int32_t, uint32_t, u_int32_t])
AC_CHECK_TYPES([int64_t, uint64_t, u_int64_t])
-AC_CHECK_TYPES([ssize_t])
+AC_CHECK_TYPES([size_t, ssize_t])
SLON_AC_FUNC_POSIX_SIGNALS()
+if test "x$ac_cv_type_size_t" = x""yes; then
+ AC_DEFINE_UNQUOTED(SIZE_T_TYPE, [size_t], [Type to use for size_t])
+else
+ AC_DEFINE_UNQUOTED(SIZE_T_TYPE, [int], [Type to use for size_t])
+fi
+
# ----
# Locate PostgreSQL paths
# ----
diff -Nurd slony1-2.0.3/src/slony_logshipper/parser.y
slony1-2.0.3-patched/src/slony_logshipper/parser.y
--- slony1-2.0.3/src/slony_logshipper/parser.y 2009-08-17 13:09:59.000000000
-0400
+++ slony1-2.0.3-patched/src/slony_logshipper/parser.y 2010-04-23
11:55:30.000000000 -0400
@@ -11,6 +11,7 @@
*-------------------------------------------------------------------------
*/
+#include "config.h"
#include "postgres.h"
#include "libpq-fe.h"
#include "slony_logshipper.h"
@@ -22,7 +23,7 @@
* Global data
*/
char *current_file = "<stdin>";
-extern int yyleng;
+extern SIZE_T_TYPE yyleng;
#ifdef DEBUG
int yydebug=1;
#endif
--- End Message ---
_______________________________________________
Slony1-general mailing list
[email protected]
http://lists.slony.info/mailman/listinfo/slony1-general
