diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-10 03:34:42 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-10 03:34:42 +0800 |
| commit | 59b2abb1a27d2de82d2b1b69a0a49d0af5982177 (patch) | |
| tree | 089d35076d61340e9280696a684e5c77d0de0ccd /databases/evolution-data-server | |
| parent | 38c30f64736bdef12d115be25dd55b876fcd835f (diff) | |
| download | marcuscom-ports-59b2abb1a27d2de82d2b1b69a0a49d0af5982177.tar marcuscom-ports-59b2abb1a27d2de82d2b1b69a0a49d0af5982177.tar.gz marcuscom-ports-59b2abb1a27d2de82d2b1b69a0a49d0af5982177.tar.bz2 marcuscom-ports-59b2abb1a27d2de82d2b1b69a0a49d0af5982177.tar.lz marcuscom-ports-59b2abb1a27d2de82d2b1b69a0a49d0af5982177.tar.xz marcuscom-ports-59b2abb1a27d2de82d2b1b69a0a49d0af5982177.tar.zst marcuscom-ports-59b2abb1a27d2de82d2b1b69a0a49d0af5982177.zip | |
Update the stacksize for 64-bit platforms, and only patch per-thread
stacksizes on versions of FreeBSD that need it.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3906 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases/evolution-data-server')
| -rw-r--r-- | databases/evolution-data-server/Makefile | 9 | ||||
| -rw-r--r-- | databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c (renamed from databases/evolution-data-server/files/patch-libedataserver_e-msgport.c) | 19 |
2 files changed, 20 insertions, 8 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 6088e89c5..f7a5fde2e 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= evolution-data-server PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 @@ -38,6 +39,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ PLIST_SUB= VERSION="1.2" EVO_VERSION="1.2" +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 600012 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c +.endif + .if !defined(WITHOUT_LDAP) USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-openldap=yes @@ -51,4 +58,4 @@ pre-everything:: @${ECHO_MSG} " WITHOUT_LDAP Disable LDAP support" @${ECHO_MSG} "" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/databases/evolution-data-server/files/patch-libedataserver_e-msgport.c b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c index a82733daa..7383f939f 100644 --- a/databases/evolution-data-server/files/patch-libedataserver_e-msgport.c +++ b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c @@ -1,6 +1,6 @@ ---- libedataserver/e-msgport.c.orig Wed Jan 14 00:04:04 2004 -+++ libedataserver/e-msgport.c Sun Sep 19 14:01:25 2004 -@@ -921,9 +921,13 @@ +--- libedataserver/e-msgport.c.orig Thu Dec 2 22:33:06 2004 ++++ libedataserver/e-msgport.c Wed Mar 9 14:31:46 2005 +@@ -921,9 +921,18 @@ void e_thread_put(EThread *e, EMsg *msg) { pthread_t id; @@ -9,12 +9,17 @@ pthread_mutex_lock(&e->mutex); + pthread_attr_init(&attr); -+ /* Give us a 1 MB thread stack size. */ -+ pthread_attr_setstacksize(&attr, 0x100000); ++ /* Give us a 1 MB thread stacksize on 32-bit architectures, and ++ * a 2 MB thread stacksize on 64-bit architectures. */ ++ if (sizeof (void *) == 8) { ++ pthread_attr_setstacksize(&attr, 0x200000); ++ } else { ++ pthread_attr_setstacksize(&attr, 0x100000); ++ } /* the caller forgot to tell us what to do, well, we can't do anything can we */ if (e->received == NULL) { -@@ -962,13 +966,14 @@ +@@ -962,13 +971,14 @@ e_msgport_put(e->server_port, msg); if (e->waiting == 0 && g_list_length(e->id_list) < e->queue_limit @@ -30,7 +35,7 @@ pthread_mutex_unlock(&e->mutex); return; } -@@ -977,12 +982,13 @@ +@@ -977,12 +987,13 @@ if (e->id == E_THREAD_NONE) { int err; |