projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
6278f4f
)
Fixes for OSX Lion
author
Brian Aker
<brian@tangent.org>
Fri, 27 Jul 2012 04:00:47 +0000
(21:00 -0700)
committer
Brian Aker
<brian@tangent.org>
Fri, 27 Jul 2012 04:00:47 +0000
(21:00 -0700)
ChangeLog
patch
|
blob
|
history
bootstrap.sh
patch
|
blob
|
history
libmemcached-1.0/types.h
patch
|
blob
|
history
libmemcached/instance.h
patch
|
blob
|
history
libtest/server_container.cc
patch
|
blob
|
history
m4/ax_pthread.m4
patch
|
blob
|
history
m4/pandora_warnings.m4
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 76edf62a095204144e483ecadc29a07fe8f54cc4..76285fa62a86232355f215da529c5f8a970c0cab 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,5
+1,6
@@
1.0.10
* --disable-assert has been removed from configure, and --enable-assert has been added in its place.
1.0.10
* --disable-assert has been removed from configure, and --enable-assert has been added in its place.
+* Compiling fixes for Clang on OSX Mountain Lion.
1.0.9 Wed Jul 4 22:46:19 EDT 2012
1.0.9 Wed Jul 4 22:46:19 EDT 2012
diff --git
a/bootstrap.sh
b/bootstrap.sh
index 240f6ac0ae39e38a158bd1c7bf21658eeb481520..109767bcd8b5606cee805c2b20d8fc9fd19b5227 100755
(executable)
--- a/
bootstrap.sh
+++ b/
bootstrap.sh
@@
-2,7
+2,12
@@
if test -f configure; then make clean; make merge-clean; make distclean; fi;
if test -f configure; then make clean; make merge-clean; make distclean; fi;
-rm -r -f autom4te.cache
+rm -r -f autom4te.cache
/ config.h config.log config.status
./config/autorun.sh
./config/autorun.sh
-./configure --enable-assert
+if [ $(uname) = "Darwin" ];
+then
+ ./configure CC=clang CXX=clang++ --enable-assert
+else
+ ./configure --enable-assert
+fi
make
make
diff --git
a/libmemcached-1.0/types.h
b/libmemcached-1.0/types.h
index dc61a819c5457a5f1350a7a7a5ab618349c15138..53992d3aee9717fd4bc9e4c10df3537d3b9c0960 100644
(file)
--- a/
libmemcached-1.0/types.h
+++ b/
libmemcached-1.0/types.h
@@
-40,7
+40,7
@@
#ifdef __cplusplus
#ifdef __cplusplus
-namespace org { namespace libmemcached {
class
Instance; } }
+namespace org { namespace libmemcached {
struct
Instance; } }
struct memcached_st;
struct memcached_stat_st;
struct memcached_st;
struct memcached_stat_st;
diff --git
a/libmemcached/instance.h
b/libmemcached/instance.h
index 6a56aa4c7b20f22b0f97238d6eab299e8ea48802..dc9e45ede805939f62cac8fbb352259c96e1d1f3 100644
(file)
--- a/
libmemcached/instance.h
+++ b/
libmemcached/instance.h
@@
-59,6
+59,7
@@
namespace org {
namespace libmemcached {
namespace org {
namespace libmemcached {
+// @todo Complete class transformation
struct Instance {
in_port_t port() const
{
struct Instance {
in_port_t port() const
{
diff --git
a/libtest/server_container.cc
b/libtest/server_container.cc
index 0448e20900e2b847831a6f5c802a073e68eb9135..fa98c7399e925c760de902694f380a26b4ebf133 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-182,7
+182,7
@@
bool server_startup_st::validate()
bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message)
{
bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message)
{
- construct.start_server(server_type, try_port, argc, argv, opt_startup_message);
+
return
construct.start_server(server_type, try_port, argc, argv, opt_startup_message);
}
bool server_startup_st::start_server(const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message)
}
bool server_startup_st::start_server(const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message)
diff --git
a/m4/ax_pthread.m4
b/m4/ax_pthread.m4
index e20a388ca869b2bf1be9946ef93c37146a9db387..e0d54ad935627dc258cd2d93a9bf79c7e72722e8 100644
(file)
--- a/
m4/ax_pthread.m4
+++ b/
m4/ax_pthread.m4
@@
-82,7
+82,7
@@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 1
7
+#serial 1
8
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
AC_DEFUN([AX_PTHREAD], [
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
AC_DEFUN([AX_PTHREAD], [
@@
-145,8
+145,8
@@
ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mt
# --thread-safe: KAI C++
# pthread-config: use pthread-config program (for GNU Pth library)
# --thread-safe: KAI C++
# pthread-config: use pthread-config program (for GNU Pth library)
-case
"${host_cpu}-${host_os}"
in
-
*
solaris*)
+case
${host_os}
in
+ solaris*)
# On Solaris (at least, for some versions), libc contains stubbed
# (non-functional) versions of the pthreads routines, so link-based
# On Solaris (at least, for some versions), libc contains stubbed
# (non-functional) versions of the pthreads routines, so link-based
@@
-159,7
+159,11
@@
case "${host_cpu}-${host_os}" in
ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
;;
ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
;;
- *-darwin*)
+ darwin12*)
+ ax_pthread_flags="$ax_pthread_flags"
+ ;;
+
+ darwin*)
ax_pthread_flags="-pthread $ax_pthread_flags"
;;
esac
ax_pthread_flags="-pthread $ax_pthread_flags"
;;
esac
@@
-254,10
+258,10
@@
if test "x$ax_pthread_ok" = xyes; then
AC_MSG_CHECKING([if more special flags are required for pthreads])
flag=no
AC_MSG_CHECKING([if more special flags are required for pthreads])
flag=no
- case
"${host_cpu}-${host_os}"
in
-
*-aix* | *-freebsd* | *-
darwin*) flag="-D_THREAD_SAFE";;
-
*-osf* | *-
hpux*) flag="-D_REENTRANT";;
-
*
solaris*)
+ case
${host_os}
in
+
aix* | freebsd* |
darwin*) flag="-D_THREAD_SAFE";;
+
osf* |
hpux*) flag="-D_REENTRANT";;
+ solaris*)
if test "$GCC" = "yes"; then
flag="-D_REENTRANT"
else
if test "$GCC" = "yes"; then
flag="-D_REENTRANT"
else
diff --git
a/m4/pandora_warnings.m4
b/m4/pandora_warnings.m4
index f3338131d6e0cfc01f2aa710707a9f49e502496e..d31965e0fd717cdc76f93305c382b34adab45a43 100644
(file)
--- a/
m4/pandora_warnings.m4
+++ b/
m4/pandora_warnings.m4
@@
-98,7
+98,7
@@
AC_DEFUN([PANDORA_WARNINGS],[
AC_CACHE_CHECK([whether it is safe to use -floop-parallelize-all],
[ac_cv_safe_to_use_floop_parallelize_all_],
[save_CFLAGS="$CFLAGS"
AC_CACHE_CHECK([whether it is safe to use -floop-parallelize-all],
[ac_cv_safe_to_use_floop_parallelize_all_],
[save_CFLAGS="$CFLAGS"
- CFLAGS="-floop-parallelize-all ${AM_CFLAGS} ${CFLAGS}"
+ CFLAGS="-
Werror -
floop-parallelize-all ${AM_CFLAGS} ${CFLAGS}"
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([],[])],
[ac_cv_safe_to_use_floop_parallelize_all_=yes],
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([],[])],
[ac_cv_safe_to_use_floop_parallelize_all_=yes],