Import of pkgsrc-2014Q1
This commit is contained in:
+24
-11
@@ -1,9 +1,10 @@
|
||||
# $NetBSD: Makefile,v 1.6 2013/05/04 12:43:50 joerg Exp $
|
||||
# $NetBSD: Makefile,v 1.9 2013/09/15 12:28:22 joerg Exp $
|
||||
#
|
||||
|
||||
DISTNAME= libmemcached-1.0.4
|
||||
DISTNAME= libmemcached-1.0.17
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= http://launchpad.net/libmemcached/1.0/${PKGVERSION}/+download/
|
||||
MASTER_SITES= http://launchpad.net/libmemcached/1.0/${PKGVERSION_NOREV}/+download/
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://libmemcached.org/
|
||||
@@ -18,16 +19,28 @@ USE_LIBTOOL= yes
|
||||
PKGCONFIG_OVERRIDE+= support/libmemcached.pc.in
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
# Avoid building 64bit on a 32bit bootstrap (affects SunOS)
|
||||
.if defined(ABI) && empty(ABI:M64)
|
||||
CONFIGURE_ARGS+= --disable-64bit
|
||||
.endif
|
||||
.include "options.mk"
|
||||
|
||||
# for backtrace
|
||||
.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
|
||||
LIBS+= -lexecinfo
|
||||
.endif
|
||||
CONFIGURE_ARGS+=--enable-jobserver=no
|
||||
|
||||
CPPFLAGS+= -D__STDC_FORMAT_MACROS
|
||||
|
||||
LIBS.SunOS+= -lsocket
|
||||
|
||||
# Disable, the configure check is completely broken.
|
||||
# Some checks are fixed in the local patches, but not enough to get
|
||||
# an actual build running
|
||||
.for sanitizer in address integer thread memory alignment bool bounds enum \
|
||||
float-cast-overflow float-divide-by-zero integer-divide-by-zero null \
|
||||
object-size return shift signed-integer-overflow unreachable \
|
||||
unsigned-integer-overflow vla-bound vptr
|
||||
CONFIGURE_ARGS+= ax_cv_check_cxxflags__Werror__fsanitize_${sanitizer:S/-/_/g}=no
|
||||
CONFIGURE_ARGS+= ax_cv_check_cflags__Werror__fsanitize_${sanitizer:S/-/_/g}=no
|
||||
.endfor
|
||||
|
||||
post-configure:
|
||||
${ECHO} '#define HAVE_MEMCACHED_BINARY 1' >> ${WRKSRC}/mem_config.h
|
||||
${ECHO} '#define MEMCACHED_BINARY "${PREFIX}/bin/memcached"' >> ${WRKSRC}/mem_config.h
|
||||
|
||||
.include "../../devel/libexecinfo/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@comment $NetBSD: PLIST,v 1.2 2012/02/07 11:34:00 fhajny Exp $
|
||||
@comment $NetBSD: PLIST,v 1.3 2013/09/12 14:20:56 fhajny Exp $
|
||||
bin/memcapable
|
||||
bin/memcat
|
||||
bin/memcp
|
||||
@@ -22,6 +22,7 @@ include/libhashkit-1.0/hashkit.h
|
||||
include/libhashkit-1.0/hashkit.hpp
|
||||
include/libhashkit-1.0/str_algorithm.h
|
||||
include/libhashkit-1.0/strerror.h
|
||||
include/libhashkit-1.0/string.h
|
||||
include/libhashkit-1.0/types.h
|
||||
include/libhashkit-1.0/visibility.h
|
||||
include/libhashkit/hashkit.h
|
||||
@@ -38,6 +39,7 @@ include/libmemcached-1.0/defaults.h
|
||||
include/libmemcached-1.0/delete.h
|
||||
include/libmemcached-1.0/deprecated_types.h
|
||||
include/libmemcached-1.0/dump.h
|
||||
include/libmemcached-1.0/encoding_key.h
|
||||
include/libmemcached-1.0/error.h
|
||||
include/libmemcached-1.0/exception.hpp
|
||||
include/libmemcached-1.0/exist.h
|
||||
@@ -85,10 +87,6 @@ include/libmemcached-1.0/visibility.h
|
||||
include/libmemcached/memcached.h
|
||||
include/libmemcached/memcached.hpp
|
||||
include/libmemcached/util.h
|
||||
include/libmemcachedprotocol-0.0/binary.h
|
||||
include/libmemcachedprotocol-0.0/callback.h
|
||||
include/libmemcachedprotocol-0.0/handler.h
|
||||
include/libmemcachedprotocol-0.0/vbucket.h
|
||||
include/libmemcachedutil-1.0/flush.h
|
||||
include/libmemcachedutil-1.0/ostream.hpp
|
||||
include/libmemcachedutil-1.0/pid.h
|
||||
@@ -98,7 +96,6 @@ include/libmemcachedutil-1.0/util.h
|
||||
include/libmemcachedutil-1.0/version.h
|
||||
lib/libhashkit.la
|
||||
lib/libmemcached.la
|
||||
lib/libmemcachedprotocol.la
|
||||
lib/libmemcachedutil.la
|
||||
lib/pkgconfig/libmemcached.pc
|
||||
man/man1/memaslap.1
|
||||
@@ -107,10 +104,14 @@ man/man1/memcat.1
|
||||
man/man1/memcp.1
|
||||
man/man1/memdump.1
|
||||
man/man1/memerror.1
|
||||
man/man1/memexist.1
|
||||
man/man1/memflush.1
|
||||
man/man1/memparse.1
|
||||
man/man1/memping.1
|
||||
man/man1/memrm.1
|
||||
man/man1/memslap.1
|
||||
man/man1/memstat.1
|
||||
man/man1/memtouch.1
|
||||
man/man3/hashkit_clone.3
|
||||
man/man3/hashkit_crc32.3
|
||||
man/man3/hashkit_create.3
|
||||
@@ -214,3 +215,4 @@ man/man3/memcached_touch.3
|
||||
man/man3/memcached_touch_by_key.3
|
||||
man/man3/memcached_verbosity.3
|
||||
man/man3/memcached_version.3
|
||||
share/aclocal/ax_libmemcached.m4
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $NetBSD: buildlink3.mk,v 1.2 2012/02/07 11:34:00 fhajny Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.3 2013/09/16 16:46:32 fhajny Exp $
|
||||
|
||||
BUILDLINK_TREE+= libmemcached
|
||||
|
||||
@@ -8,6 +8,13 @@ LIBMEMCACHED_BUILDLINK3_MK:=
|
||||
BUILDLINK_API_DEPENDS.libmemcached+= libmemcached>=0.53
|
||||
BUILDLINK_ABI_DEPENDS.libmemcached+= libmemcached>=0.53
|
||||
BUILDLINK_PKGSRCDIR.libmemcached?= ../../devel/libmemcached
|
||||
|
||||
pkgbase:= libmemcached
|
||||
.include "../../mk/pkg-build-options.mk"
|
||||
|
||||
.if !empty(PKG_BUILD_OPTIONS.libmemcached:Msasl)
|
||||
. include "../../security/cyrus-sasl/buildlink3.mk"
|
||||
.endif
|
||||
.endif # LIBMEMCACHED_BUILDLINK3_MK
|
||||
|
||||
BUILDLINK_TREE+= -libmemcached
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
$NetBSD: distinfo,v 1.4 2013/06/04 21:17:17 fhajny Exp $
|
||||
$NetBSD: distinfo,v 1.7 2013/09/15 12:28:22 joerg Exp $
|
||||
|
||||
SHA1 (libmemcached-1.0.4.tar.gz) = a74644a368b14954c80623879bd722ebf552f857
|
||||
RMD160 (libmemcached-1.0.4.tar.gz) = 2a9c71cd7894ed1c55d2557fd71fc75b5bc54ceb
|
||||
Size (libmemcached-1.0.4.tar.gz) = 951310 bytes
|
||||
SHA1 (patch-configure) = 9bda748d780dc2b3d0f114e302c04a5f5d3b0eee
|
||||
SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 80a4d84457659dfc22c9004469426ba1c35a6f73
|
||||
SHA1 (patch-tests_libmemcached-1.0_pool.cc) = b222a16d3ef03a9d60379aeacb10a205961732e0
|
||||
SHA1 (libmemcached-1.0.17.tar.gz) = 1023bc8c738b1f5b8ea2cd16d709ec6b47c3efa8
|
||||
RMD160 (libmemcached-1.0.17.tar.gz) = f0e617e0dc5f2eb27f9da7ea5a9f5a7b043b80a8
|
||||
Size (libmemcached-1.0.17.tar.gz) = 1023177 bytes
|
||||
SHA1 (patch-configure) = 82c954244cc79f892b3ed08be1b5c8f60bceab1a
|
||||
SHA1 (patch-libmemcached-1.0_deprecated__types.h) = bf4c3440b1734bf73f39940c983eb3fb1be171d7
|
||||
SHA1 (patch-libmemcached-1.0_memcached.h) = 0edfc9d7622fec2b690e2e253f3f8c9aaf4147d5
|
||||
SHA1 (patch-libmemcached_byteorder.cc) = 18d5b6447e7457bf35dbac6c693735932871f095
|
||||
SHA1 (patch-libtest_lite.h) = 6460bd76650111613311c35d3d836674dab0c801
|
||||
SHA1 (patch-libtest_main.cc) = e9c2d88085f2a66b3296f7acd40484e485fd3c16
|
||||
SHA1 (patch-libtest_test.hpp) = 684d1dcfe5c6a4b510353bd578c8919da216542b
|
||||
SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 8dacea6366738254e1a71eef8cd4e04329f4e53c
|
||||
SHA1 (patch-tests_libmemcached-1.0_pool.cc) = d5656a54277f7155b1b78a0f90fd0f939ef39be6
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
# $NetBSD: options.mk,v 1.1 2013/09/12 14:21:27 fhajny Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.libmemcached
|
||||
PKG_SUPPORTED_OPTIONS= sasl
|
||||
PKG_SUGGESTED_OPTIONS= sasl
|
||||
|
||||
#.if ${OPSYS} == "SunOS"
|
||||
#PKG_SUGGESTED_OPTIONS+= dtrace
|
||||
#.endif
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
###
|
||||
### Cyrus SASL support
|
||||
###
|
||||
.if !empty(PKG_OPTIONS:Msasl)
|
||||
CONFIGURE_ARGS+= --enable-sasl
|
||||
. include "../../security/cyrus-sasl/buildlink3.mk"
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-sasl
|
||||
.endif
|
||||
|
||||
###
|
||||
### DTrace support
|
||||
###
|
||||
#.if !empty(PKG_OPTIONS:Mdtrace)
|
||||
#CONFIGURE_ARGS+= --enable-dtrace
|
||||
#.endif
|
||||
@@ -1,32 +1,454 @@
|
||||
$NetBSD: patch-configure,v 1.1 2012/02/07 11:34:00 fhajny Exp $
|
||||
$NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
|
||||
|
||||
* Fix DTrace flags.
|
||||
* Avoid installing under ${PREFIX}/lib/amd64 on SunOS.
|
||||
|
||||
--- configure.orig 2011-09-28 15:26:49.000000000 +0000
|
||||
--- configure.orig 2013-04-03 04:22:41.000000000 +0000
|
||||
+++ configure
|
||||
@@ -5267,10 +5267,11 @@ fi
|
||||
@@ -26555,15 +26555,15 @@ else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
||||
isainfo_k=`${ISAINFO} -k`
|
||||
- DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_b}"
|
||||
+ DTRACEFLAGS="${DTRACEFLAGS}"
|
||||
|
||||
if test "x$ac_enable_64bit" = "xyes"; then :
|
||||
|
||||
+ DTRACEFLAGS="${DTRACEFLAGS} -64"
|
||||
|
||||
if test "x${ac_cv_env_LDFLAGS_set}" = "x"; then :
|
||||
|
||||
@@ -5278,11 +5279,6 @@ fi
|
||||
|
||||
fi
|
||||
|
||||
- if test "x$libdir" = "x\${exec_prefix}/lib"; then :
|
||||
+int *p;
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-
|
||||
- libdir="${libdir}/${isainfo_k}"
|
||||
- ;
|
||||
+ return *p;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -26628,7 +26628,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -26685,15 +26685,17 @@ else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
+int f;
|
||||
+
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-
|
||||
-fi
|
||||
+ ++f;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -26750,15 +26752,17 @@ else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
if test "x${ac_cv_env_CFLAGS_set}" = "x"; then :
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-
|
||||
- ;
|
||||
+ int *p = malloc(sizeof(int));
|
||||
+ return *p;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -26823,7 +26827,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -26888,7 +26892,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -26953,7 +26957,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27018,7 +27022,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27083,7 +27087,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27148,7 +27152,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27213,7 +27217,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27278,7 +27282,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27343,7 +27347,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27408,7 +27412,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27473,7 +27477,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27529,16 +27533,19 @@ else
|
||||
CFLAGS="$CFLAGS -Werror $flag"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
+#include <unistd.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-
|
||||
- ;
|
||||
+ int i = 0;
|
||||
+ while (sleep(1))
|
||||
+ ++i;
|
||||
+ return i;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27603,7 +27610,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27668,7 +27675,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27733,7 +27740,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -27798,7 +27805,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -31956,16 +31963,16 @@ else
|
||||
CXXFLAGS="$CXXFLAGS -Werror $flag"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
+int *p;
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-
|
||||
- ;
|
||||
+ return *p;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32030,7 +32037,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32087,15 +32094,17 @@ else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
+int f;
|
||||
+
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
- ;
|
||||
+ ++f;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32155,12 +32164,12 @@ else
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-
|
||||
- ;
|
||||
+ int *p = new int;
|
||||
+ return *p;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32225,7 +32234,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32290,7 +32299,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32355,7 +32364,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32420,7 +32429,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32485,7 +32494,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32550,7 +32559,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32615,7 +32624,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32680,7 +32689,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32745,7 +32754,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32810,7 +32819,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32875,7 +32884,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -32931,16 +32940,19 @@ else
|
||||
CXXFLAGS="$CXXFLAGS -Werror $flag"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
+#include <unistd.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-
|
||||
- ;
|
||||
+ int i = 0;
|
||||
+ while (sleep(1))
|
||||
+ ++i;
|
||||
+ return i;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -33005,7 +33017,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -33070,7 +33082,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -33135,7 +33147,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
@@ -33200,7 +33212,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
+if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
eval "$as_CACHEVAR=yes"
|
||||
else
|
||||
eval "$as_CACHEVAR=no"
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
$NetBSD: patch-libmemcached-1.0_deprecated__types.h,v 1.2 2013/09/13 07:59:01 fhajny Exp $
|
||||
|
||||
Add type to overcome a breaking API change.
|
||||
https://bugs.launchpad.net/libmemcached/+bug/1190240
|
||||
--- libmemcached-1.0/deprecated_types.h.orig 2013-04-03 04:22:00.000000000 +0000
|
||||
+++ libmemcached-1.0/deprecated_types.h
|
||||
@@ -57,4 +57,5 @@ typedef memcached_server_fn memcached_se
|
||||
typedef memcached_trigger_key_fn memcached_trigger_key;
|
||||
typedef memcached_trigger_delete_key_fn memcached_trigger_delete_key;
|
||||
typedef memcached_dump_fn memcached_dump_func;
|
||||
+typedef memcached_instance_st *memcached_server_instance_st;
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
$NetBSD: patch-libmemcached-1.0_memcached.h,v 1.1 2013/09/15 12:28:22 joerg Exp $
|
||||
|
||||
--- libmemcached-1.0/memcached.h.orig 2013-09-14 17:06:48.000000000 +0000
|
||||
+++ libmemcached-1.0/memcached.h
|
||||
@@ -43,9 +43,13 @@
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
-# include <tr1/cinttypes>
|
||||
# include <cstddef>
|
||||
# include <cstdlib>
|
||||
+# if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
|
||||
+# include <cinttypes>
|
||||
+# else
|
||||
+# include <tr1/cinttypes>
|
||||
+# endif
|
||||
#else
|
||||
# include <inttypes.h>
|
||||
# include <stddef.h>
|
||||
@@ -0,0 +1,15 @@
|
||||
$NetBSD: patch-libmemcached_byteorder.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $
|
||||
|
||||
Need ntohll/htonll defined.
|
||||
--- libmemcached/byteorder.cc.orig 2013-04-03 04:22:00.000000000 +0000
|
||||
+++ libmemcached/byteorder.cc
|
||||
@@ -36,6 +36,9 @@
|
||||
*/
|
||||
|
||||
#include "mem_config.h"
|
||||
+#ifdef __sun
|
||||
+# include "sys/byteorder.h"
|
||||
+#endif
|
||||
#include "libmemcached/byteorder.h"
|
||||
|
||||
/* Byte swap a 64-bit number. */
|
||||
@@ -0,0 +1,14 @@
|
||||
$NetBSD: patch-libtest_lite.h,v 1.1 2013/09/12 14:20:56 fhajny Exp $
|
||||
|
||||
NetBSD doesn't have alloca.h.
|
||||
--- libtest/lite.h.orig 2013-04-03 04:22:00.000000000 +0000
|
||||
+++ libtest/lite.h
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
#if defined(_WIN32)
|
||||
# include <malloc.h>
|
||||
-#else
|
||||
+#elif !defined(__NetBSD__)
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-libtest_main.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $
|
||||
|
||||
strings.h needed for rindex.
|
||||
--- libtest/main.cc.orig 2013-04-03 04:22:00.000000000 +0000
|
||||
+++ libtest/main.cc
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <memory>
|
||||
+#include <strings.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-libtest_test.hpp,v 1.1 2013/09/12 14:20:56 fhajny Exp $
|
||||
|
||||
cstdarg needed for va_start.
|
||||
--- libtest/test.hpp.orig 2013-04-03 04:22:00.000000000 +0000
|
||||
+++ libtest/test.hpp
|
||||
@@ -57,6 +57,7 @@
|
||||
|
||||
#define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__
|
||||
|
||||
+#include <cstdarg>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <arpa/inet.h>
|
||||
@@ -1,6 +1,7 @@
|
||||
$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.2 2013/06/04 21:17:17 fhajny Exp $
|
||||
$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $
|
||||
|
||||
--- tests/libmemcached-1.0/ketama.cc.orig 2013-05-05 20:35:41.000000000 +0000
|
||||
Use stdint.
|
||||
--- tests/libmemcached-1.0/ketama.cc.orig 2013-04-03 04:22:00.000000000 +0000
|
||||
+++ tests/libmemcached-1.0/ketama.cc
|
||||
@@ -33,6 +33,7 @@
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
@@ -8,9 +9,9 @@ $NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.2 2013/06/04 21:17:17 fhajny
|
||||
*/
|
||||
+#define __STDC_CONSTANT_MACROS
|
||||
|
||||
#include <config.h>
|
||||
#include <mem_config.h>
|
||||
#include <libtest/test.hpp>
|
||||
@@ -43,6 +44,7 @@
|
||||
@@ -45,6 +46,7 @@
|
||||
|
||||
#include <tests/ketama.h>
|
||||
#include <tests/ketama_test_cases.h>
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.2 2013/06/04 21:17:17 fhajny Exp $
|
||||
$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $
|
||||
|
||||
--- tests/libmemcached-1.0/pool.cc.orig 2013-05-05 20:36:30.000000000 +0000
|
||||
Use stdint.
|
||||
--- tests/libmemcached-1.0/pool.cc.orig 2013-04-03 04:22:00.000000000 +0000
|
||||
+++ tests/libmemcached-1.0/pool.cc
|
||||
@@ -34,7 +34,7 @@
|
||||
@@ -34,6 +34,7 @@
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
-
|
||||
+#define __STDC_CONSTANT_MACROS
|
||||
#include <config.h>
|
||||
#include <libtest/test.hpp>
|
||||
|
||||
@@ -44,6 +44,7 @@ using namespace libtest;
|
||||
#include <mem_config.h>
|
||||
#include <libtest/test.hpp>
|
||||
@@ -44,6 +45,7 @@ using namespace libtest;
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <cerrno>
|
||||
|
||||
Reference in New Issue
Block a user