Date: Mon, 18 Aug 2003 14:00:14 -0700 (PDT) From: Don Lewis <truckman@FreeBSD.org> To: mb@imp.ch Cc: openoffice@FreeBSD.org Subject: Re: Port status, mailing lists? Message-ID: <200308182100.h7IL0EM7028845@gw.catspoiler.org> In-Reply-To: <20030818214024.B98965@cvs.imp.ch>
next in thread | previous in thread | raw e-mail | index | archive | help
On 18 Aug, Martin Blapp wrote: > > Hi, > >> > For some time now I have attempted to build OO on my 5-CURRENT machine, >> > with no luck. The most persistent problem has been with the stlport >> > part, which refuses to compile regardless of the compiler version I >> > use/specify. >> >> You may be in luck. I decided to rebuild openoffice on my machine >> running a recent version of current and I've been fixing the bugs that >> I've been finding. I just got the stlport stuff to build last night, >> but now the build dies shortly thereafter. I just fixed that bug and >> kicked off another build. Keep your fingers crossed ;-) > > Errm. I'll commit a bunch of patches needed by current this evening. > Can you send me what you have fixed ? Appended below, but now I'm stuck here and I don't know enough about c++ to fix this one: Making: ../../../unxfbsd.pro/obj/hi_linkhelper.obj c++ -w -c -I. -I. -I../inc -I../../../source/inc -I../../../inc -I../../../unx/inc -I../../../unxfbsd.pro/inc -I. -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solver/641/unxfbsd.pro/inc/stl -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solver/641/unxfbsd.pro/inc/external -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solver/641/unxfbsd.pro/inc -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solenv/unxfbsd/inc -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solenv/inc -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/res -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solver/641/unxfbsd.pro/inc/stl -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solenv/inc/Xp31 -I/usr/local/jdk1.3.1/include -I/usr/local/jdk1.3.1/include/freebsd -I/usr/local/jdk1.3.1/include/green_threads/include -I/usr/X11R6/include -I. -I../../../res -I. -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solenv/unxfbsdi/usr/include -I/usr/X11R6/include -O -pipe -fno-for-scope -fpermi! ssive -fexceptions -fPIC -DFREEBSD -DUNX -DVCL -DGCC -DC300 -DINTEL -DCVER=C300 -D_USE_NAMESPACE -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=501105 -D_THREAD_SAFE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DSUPD=641 -DBUILD=8584 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOPTIMIZE -DEXCEPTIONS_ON -DCUI -DSOLAR_JAVA -DSRC641 -DMULTITHREAD -o ../../../unxfbsd.pro/obj/hi_linkhelper.o /usr/ports/editors/openoffice/work/oo_1.0.3_src/autodoc/source/display/idl/hi_linkhelper.cxx /usr/ports/editors/openoffice/work/oo_1.0.3_src/autodoc/source/display/idl/hi_linkhelper.cxx: In member function `const ary::idl::Module* LinkHelper::Search_Module(output::Node&) const': /usr/ports/editors/openoffice/work/oo_1.0.3_src/autodoc/source/display/idl/hi_linkhelper.cxx:98: error: invalid static_cast from type `UINT32' to type `ary::idl::Ce_id' dmake: Error code 1, while making '../../../unxfbsd.pro/obj/hi_linkhelper.obj' ---* TG_SLO.MK *--- ERROR: Error 65280 occurred while making /usr/ports/editors/openoffice/work/oo_1.0.3_src/autodoc/source/display/idl dmake: Error code 1, while making 'build_all' ---* TG_SLO.MK *--- *** Error code 255 Stop in /usr/ports/editors/openoffice. Index: editors/openoffice/files/patch-stlport+STLport-4.5.patch =================================================================== RCS file: /home/ncvs/ports/editors/openoffice/files/patch-stlport+STLport-4.5.patch,v retrieving revision 1.3 diff -u -r1.3 patch-stlport+STLport-4.5.patch --- editors/openoffice/files/patch-stlport+STLport-4.5.patch 2 Aug 2002 23:59:08 -0000 1.3 +++ editors/openoffice/files/patch-stlport+STLport-4.5.patch 18 Aug 2003 06:34:28 -0000 @@ -1,6 +1,43 @@ ---- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002 -+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002 -@@ -174,3 +174,110 @@ +--- ../stlport/STLport-4.5.patch.orig Thu Jan 9 04:45:57 2003 ++++ ../stlport/STLport-4.5.patch Sun Aug 17 23:32:29 2003 +@@ -64,7 +64,35 @@ + ! + ! + *** misc/STLport-4.5/stlport/config/stl_gcc.h Tue Sep 4 13:10:16 2001 +---- misc/build/STLport-4.5/stlport/config/stl_gcc.h Mon Nov 11 09:37:18 2002 ++--- misc/build/STLport-4.5/stlport/config/stl_gcc.h Sun Aug 17 22:49:59 2003 ++*************** ++*** 9,15 **** ++ ++ # define _STLP_NO_MEMBER_TEMPLATE_KEYWORD ++ ++! # if defined(__FreeBSD__) || defined (__hpux) ++ # define _STLP_NO_WCHAR_T ++ # endif ++ ++--- 9,26 ---- ++ ++ # define _STLP_NO_MEMBER_TEMPLATE_KEYWORD ++ ++! /* ++! * wchar support was committed on 2003/04/29 and __FreeBSD version was ++! * incremented on 2003/05/02 ++! */ ++! # if defined(__FreeBSD__) ++! # include <osreldate.h> ++! # if (__FreeBSD_version < 500113) ++! # define _STLP_NO_WCHAR_T ++! # endif ++! # endif ++! ++! # if defined (__hpux) ++ # define _STLP_NO_WCHAR_T ++ # endif ++ + *************** typedef unsigned int wint_t; + *** 226,233 **** + +@@ -104,3 +132,98 @@ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { public: __Named_exception(const string& __str) @@ -99,15 +136,3 @@ ++# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ ++ ++ -+--- misc/STLport-4.5/stlport/cwchar.orig Tue May 28 22:51:31 2002 -++++ misc/build/STLport-4.5/stlport/cwchar Tue May 28 22:55:33 2002 -+@@ -21,6 +21,9 @@ -+ # include <stl/_prolog.h> -+ # endif -+ -++#ifdef __FreeBSD__ -++# include <../wchar.h> -++#endif -+ # include <stl/_cwchar.h> -+ -+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120) Index: editors/openoffice/files/patch-sal+osl+unx+system.h =================================================================== RCS file: /home/ncvs/ports/editors/openoffice/files/patch-sal+osl+unx+system.h,v retrieving revision 1.5 diff -u -r1.5 patch-sal+osl+unx+system.h --- editors/openoffice/files/patch-sal+osl+unx+system.h 8 May 2003 18:41:13 -0000 1.5 +++ editors/openoffice/files/patch-sal+osl+unx+system.h 18 Aug 2003 18:24:14 -0000 @@ -1,5 +1,5 @@ --- ../sal/osl/unx/system.h.orig Tue Aug 20 15:54:55 2002 -+++ ../sal/osl/unx/system.h Thu May 8 20:31:08 2003 ++++ ../sal/osl/unx/system.h Mon Aug 18 11:21:01 2003 @@ -203,12 +203,19 @@ # include <dlfcn.h> # include <sys/filio.h> @@ -40,6 +40,34 @@ #endif #ifdef SCO +@@ -248,7 +257,7 @@ + # define NO_PTHREAD_PRIORITY + extern int pthread_cancel(pthread_t); + extern unsigned int nanosleep(unsigned int); +-# define SLEEP_TIMESPEC(timespec) (timespec##.tv_sec > 0) ? sleep(timespec##.tv_sec), nanosleep(timespec##.tv_nsec) : nanosleep(timespec##.tv_nsec) ++# define SLEEP_TIMESPEC(timespec) (timespec.tv_sec > 0) ? sleep(timespec.tv_sec), nanosleep(timespec.tv_nsec) : nanosleep(timespec.tv_nsec) + # define PATH_MAX _POSIX_PATH_MAX + # define S_ISSOCK S_ISFIFO + # define PTHREAD_SIGACTION pthread_sigaction +@@ -460,14 +469,14 @@ + + #ifndef NORMALIZE_TIMESPEC + # define NORMALIZE_TIMESPEC(timespec) \ +- timespec##.tv_sec += timespec##.tv_nsec / 1000000000; \ +- timespec##.tv_nsec %= 1000000000; ++ timespec.tv_sec += timespec.tv_nsec / 1000000000; \ ++ timespec.tv_nsec %= 1000000000; + #endif + + #ifndef SET_TIMESPEC + # define SET_TIMESPEC(timespec, sec, nsec) \ +- timespec##.tv_sec = (sec); \ +- timespec##.tv_nsec = (nsec); \ ++ timespec.tv_sec = (sec); \ ++ timespec.tv_nsec = (nsec); \ + NORMALIZE_TIMESPEC(timespec); + #endif + @@ -569,12 +578,14 @@ #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308182100.h7IL0EM7028845>