- fix glaring startup deadlocks by properly setting PTHREAD_CFLAGS. The
deadlocks were caused by the inconsistent detection of pthreads by the boost headers in different parts of the OOo build which resulted in an uninitialized mutex. - fix a few compile errors in the nas sub-project build. General testing and patches from the community are encouraged.
This commit is contained in:
kurt
parent
ae59304311
commit
7f68540334
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2006/10/14 17:33:55 robert Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2006/10/18 12:45:59 kurt Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= i386
|
||||
|
||||
@ -7,7 +7,7 @@ COMMENT= "a multi-platform productivity suite"
|
||||
VERSION= 2.0.4
|
||||
DISTNAME= OOo_${VERSION}_src
|
||||
WRKDIST= ${WRKDIR}/OOD680_m5
|
||||
PKGNAME= openoffice-${VERSION}
|
||||
PKGNAME= openoffice-${VERSION}p0
|
||||
CATEGORIES= editors productivity
|
||||
|
||||
SHARED_LIBS= icudata 26.0 \
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-config_office_configure_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
|
||||
--- config_office/configure.in.orig.port Wed Jul 19 05:52:02 2006
|
||||
+++ config_office/configure.in Fri Aug 18 15:47:42 2006
|
||||
@@ -755,6 +755,15 @@ case "$build_os" in
|
||||
$OpenBSD: patch-config_office_configure_in,v 1.3 2006/10/18 12:45:59 kurt Exp $
|
||||
--- config_office/configure.in.orig.port Mon Aug 28 04:37:20 2006
|
||||
+++ config_office/configure.in Tue Oct 17 15:29:20 2006
|
||||
@@ -773,6 +773,15 @@ case "$build_os" in
|
||||
AC_MSG_RESULT([$PTHREAD_LIBS])
|
||||
_os=FreeBSD
|
||||
;;
|
||||
@ -10,14 +10,14 @@ $OpenBSD: patch-config_office_configure_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
|
||||
+ test_gtk=yes
|
||||
+ build_cairo=yes
|
||||
+ test_kde=yes
|
||||
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
|
||||
+ PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
|
||||
+ PTHREAD_LIBS="-pthread"
|
||||
+ _os=OpenBSD
|
||||
+ ;;
|
||||
osf)
|
||||
test_x=dontknow
|
||||
test_cups=no
|
||||
@@ -2327,11 +2336,11 @@ dnl ====================================
|
||||
@@ -2367,11 +2376,11 @@ dnl ====================================
|
||||
dnl Checks for programs.
|
||||
dnl ===================================================================
|
||||
dnl Check whether there's a C pre-processor.
|
||||
@ -31,7 +31,7 @@ $OpenBSD: patch-config_office_configure_in,v 1.2 2006/08/20 03:36:52 kurt Exp $
|
||||
AC_PROG_CXXCPP
|
||||
fi
|
||||
|
||||
@@ -2461,8 +2470,8 @@ if test "$_os" != "WINNT" -a \( "z$enabl
|
||||
@@ -2501,8 +2510,8 @@ if test "$_os" != "WINNT" -a \( "z$enabl
|
||||
AIX)
|
||||
PKGFORMAT=aix
|
||||
;;
|
||||
|
||||
@ -1,7 +1,49 @@
|
||||
$OpenBSD: patch-nas_nas-1_6_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
|
||||
$OpenBSD: patch-nas_nas-1_6_patch,v 1.3 2006/10/18 12:45:59 kurt Exp $
|
||||
--- nas/nas-1.6.patch.orig.port Fri Mar 10 10:59:50 2006
|
||||
+++ nas/nas-1.6.patch Fri Aug 18 15:47:43 2006
|
||||
@@ -763,3 +763,15 @@
|
||||
+++ nas/nas-1.6.patch Tue Oct 17 22:42:40 2006
|
||||
@@ -109,7 +109,7 @@
|
||||
*/
|
||||
|
||||
#ifndef WIN32
|
||||
-! # if defined(__NetBSD__) || defined(__FreeBSD__)
|
||||
+! # if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
# include <limits.h>
|
||||
# define MAXSHORT SHRT_MAX
|
||||
# define MINSHORT SHRT_MIN
|
||||
@@ -497,7 +497,7 @@
|
||||
#include <sys/param.h>
|
||||
#include <assert.h>
|
||||
|
||||
-! #ifdef __NetBSD__
|
||||
+! #if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
! # include <sys/ioctl.h>
|
||||
! # include <soundcard.h>
|
||||
#else
|
||||
@@ -619,6 +619,23 @@
|
||||
*** misc/nas-1.6/server/Imakefile 2002-07-24 03:49:33.000000000 +0200
|
||||
--- misc/build/nas-1.6/server/Imakefile 2004-09-03 12:50:52.883257512 +0200
|
||||
***************
|
||||
+*** 60,66 ****
|
||||
+ SYSLIBS =
|
||||
+ #endif
|
||||
+
|
||||
+! #ifdef NetBSDArchitecture
|
||||
+ SYSLIBS = -lossaudio
|
||||
+ #endif
|
||||
+
|
||||
+--- 60,66 ----
|
||||
+ SYSLIBS =
|
||||
+ #endif
|
||||
+
|
||||
+! #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
|
||||
+ SYSLIBS = -lossaudio
|
||||
+ #endif
|
||||
+
|
||||
+***************
|
||||
*** 105,110 ****
|
||||
--- 105,113 ----
|
||||
# if defined(LinuxArchitecture)
|
||||
@@ -763,3 +780,72 @@
|
||||
XtAppAddActions(appContext, actions, XtNumber(actions));
|
||||
|
||||
if (argc == 3)
|
||||
@ -17,3 +59,60 @@ $OpenBSD: patch-nas_nas-1_6_patch,v 1.2 2006/08/20 03:36:52 kurt Exp $
|
||||
+ MakeSubdirs($(SUBDIRS))
|
||||
+ DependSubdirs($(SUBDIRS))
|
||||
+--- 27,31 ----
|
||||
+*** misc/nas-1.6/lib/audio/ConnSvr.c Sat Feb 23 17:06:29 2002
|
||||
+--- misc/build/nas-1.6/lib/audio/ConnSvr.c Mon Oct 16 23:09:28 2006
|
||||
+***************
|
||||
+*** 54,60 ****
|
||||
+ #define FIOSNBIO FIONBIO
|
||||
+ #endif /* WIN32 */
|
||||
+
|
||||
+! #if defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+ #include <sys/param.h>
|
||||
+ #endif /* __FreeBSD__ */
|
||||
+ #include <ctype.h>
|
||||
+--- 54,60 ----
|
||||
+ #define FIOSNBIO FIONBIO
|
||||
+ #endif /* WIN32 */
|
||||
+
|
||||
+! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
+ #include <sys/param.h>
|
||||
+ #endif /* __FreeBSD__ */
|
||||
+ #include <ctype.h>
|
||||
+*** misc/nas-1.6/server/dia/auevents.c Sat Oct 6 17:19:46 2001
|
||||
+--- misc/build/nas-1.6/server/dia/auevents.c Mon Oct 16 23:10:40 2006
|
||||
+***************
|
||||
+*** 29,35 ****
|
||||
+ # define _BSD_SIGNALS
|
||||
+ #endif
|
||||
+
|
||||
+! #ifdef __NetBSD__
|
||||
+ # include <sys/types.h>
|
||||
+ #endif
|
||||
+
|
||||
+--- 29,35 ----
|
||||
+ # define _BSD_SIGNALS
|
||||
+ #endif
|
||||
+
|
||||
+! #if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
+ # include <sys/types.h>
|
||||
+ #endif
|
||||
+
|
||||
+*** misc/nas-1.6/server/dia/auservertype.h Wed Jul 24 20:42:28 2002
|
||||
+--- misc/build/nas-1.6/server/dia/auservertype.h Mon Oct 16 23:10:20 2006
|
||||
+***************
|
||||
+*** 14,20 ****
|
||||
+ # define SGI_SERVER
|
||||
+ #endif /* sgi */
|
||||
+
|
||||
+! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(linux) || (defined(SVR4) && (defined(SYSV386) || defined(i386))) || defined(__CYGWIN__)
|
||||
+ # define VOXWARE_SERVER
|
||||
+ #endif /* voxware */
|
||||
+
|
||||
+--- 14,20 ----
|
||||
+ # define SGI_SERVER
|
||||
+ #endif /* sgi */
|
||||
+
|
||||
+! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(linux) || (defined(SVR4) && (defined(SYSV386) || defined(i386))) || defined(__CYGWIN__)
|
||||
+ # define VOXWARE_SERVER
|
||||
+ #endif /* voxware */
|
||||
+
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user