update to commoncpp 1.6.3, from Brad.

This commit is contained in:
sthen 2009-03-08 10:28:00 +00:00
parent ce15ac65a8
commit 3411d2be5d
6 changed files with 50 additions and 25 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.3 2008/05/10 23:49:56 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2009/03/08 10:28:00 sthen Exp $
COMMENT= GNU project portable class framework for C++
VER= 1.6.2
VER= 1.6.3
DISTNAME= commoncpp2-${VER}
PKGNAME= commoncpp-${VER}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=commoncpp/}
SHARED_LIBS+= ccext2 1.0 # 0.1
SHARED_LIBS+= ccgnu2 1.0 # 0.1
SHARED_LIBS+= ccext2 1.0
SHARED_LIBS+= ccgnu2 1.0
HOMEPAGE= http://www.gnutelephony.org/index.php/GNU_Common_C++

View File

@ -1,5 +1,5 @@
MD5 (commoncpp2-1.6.2.tar.gz) = 9WQ0AoQSW95mtDq7Ssor8A==
RMD160 (commoncpp2-1.6.2.tar.gz) = uqe5hUC1018heePCU+ljZuBcfqk=
SHA1 (commoncpp2-1.6.2.tar.gz) = YpH/QYKr7z/fO185zTBs3yRYjLY=
SHA256 (commoncpp2-1.6.2.tar.gz) = qIcKor7PLWZ0DFBkbwBscYjMgjbMc5NzEHnZ9Pvnn48=
SIZE (commoncpp2-1.6.2.tar.gz) = 871333
MD5 (commoncpp2-1.6.3.tar.gz) = 9COPnyu6W2QyOMKwtC73lw==
RMD160 (commoncpp2-1.6.3.tar.gz) = EOvxDtTHNeGKoNJejiI3sJgOnnQ=
SHA1 (commoncpp2-1.6.3.tar.gz) = cu5ErT5xx0kCx209/+lR0X6rFc4=
SHA256 (commoncpp2-1.6.3.tar.gz) = CTZ6aBQTUAlV/NB8IkQnyddSxnTYDdoRNLyqJ3YiHRo=
SIZE (commoncpp2-1.6.3.tar.gz) = 886825

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-config_h_in,v 1.1 2009/03/08 10:28:00 sthen Exp $
--- config.h.in.orig Mon Sep 1 04:30:44 2008
+++ config.h.in Mon Sep 1 04:39:27 2008
@@ -251,6 +251,9 @@ typedef unsigned long long uint64;
/* Define to 1 if you have the `clock_gettime' function. */
#undef HAVE_CLOCK_GETTIME
+/* Define to 1 if you have the `clock_nanosleep' function. */
+#undef HAVE_CLOCK_NANOSLEEP
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-m4_ost_pthread_m4,v 1.1.1.1 2007/12/08 05:22:09 jakemsr Exp $
--- m4/ost_pthread.m4.orig Sat Jul 21 22:26:34 2007
+++ m4/ost_pthread.m4 Sat Jul 21 22:26:49 2007
@@ -232,7 +232,7 @@ AC_LANG_RESTORE
ost_cv_rt_library="-lrt"
AC_DEFINE(HAVE_HIRES_TIMER, [1], [have hires])
],[
- AC_CHECK_FUNCS(clock_gettime,[
+ AC_CHECK_FUNCS(clock_nanosleep,[
AC_DEFINE(HAVE_HIRES_TIMER, [1], [have hires])
$OpenBSD: patch-m4_ost_pthread_m4,v 1.2 2009/03/08 10:28:00 sthen Exp $
--- m4/ost_pthread.m4.orig Mon Sep 1 04:42:29 2008
+++ m4/ost_pthread.m4 Mon Sep 1 04:41:39 2008
@@ -239,6 +239,8 @@ AC_LANG_RESTORE
])
])
+ AC_CHECK_FUNCS(clock_nanosleep)
+
AC_CHECK_LIB(rt, mlockall,[
AC_DEFINE(HAVE_MLOCK, [1], [have mlock])
AC_DEFINE(HAVE_MLOCKALL, [1], [have memlockall])

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2008/03/31 01:08:46 jakemsr Exp $
--- src/Makefile.in.orig Tue Dec 18 11:35:37 2007
+++ src/Makefile.in Mon Jan 21 05:23:36 2008
@@ -317,7 +317,7 @@ aclocal_DATA = ost_check2.m4
$OpenBSD: patch-src_Makefile_in,v 1.3 2009/03/08 10:28:00 sthen Exp $
--- src/Makefile.in.orig Wed Aug 20 14:02:57 2008
+++ src/Makefile.in Mon Sep 1 02:47:15 2008
@@ -319,7 +319,7 @@ aclocal_DATA = ost_check2.m4
scriptdir = $(bindir)
script_DATA = ccgnu2-config
libccgnu2_la_LIBADD = @THREAD_LIBS@ @DYN_LOADER@
libccgnu2_la_LIBADD = @THREAD_LIBS@ @DYN_LOADER@ @SSL_LIBS@
-libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+libccgnu2_la_LDFLAGS = $(LT_VERSION) $(SHARED_FLAGS)
noinst_DATA = @STAGE2@
libccgnu2_la_SOURCES = thread.cpp mutex.cpp semaphore.cpp threadkey.cpp \
friends.cpp event.cpp slog.cpp dir.cpp file.cpp inaddr.cpp \
@@ -328,7 +328,7 @@ libccgnu2_la_SOURCES = thread.cpp mutex.cpp semaphore.
@@ -330,7 +330,7 @@ libccgnu2_la_SOURCES = thread.cpp mutex.cpp semaphore.
cidr.cpp private.h nat.h
@EXTRAS_TRUE@libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_timer_cpp,v 1.1 2009/03/08 10:28:00 sthen Exp $
--- src/timer.cpp.orig Mon Jun 23 09:02:09 2008
+++ src/timer.cpp Mon Sep 1 04:28:20 2008
@@ -117,7 +117,7 @@ void TimerPort::decTimer(timeout_t timeout)
active = true;
}
-#ifdef HAVE_HIRES_TIMER
+#if defined(HAVE_HIRES_TIMER) && defined(HAVE_CLOCK_NANOSLEEP)
void TimerPort::sleepTimer(void)
{
struct timespec ts;