Date: Sat, 27 Jul 2002 13:21:34 +0900 From: Seigo Tanimura <tanimura@r.dl.itc.u-tokyo.ac.jp> To: Alan E <alane@geeksrus.net> Cc: FreeBSD Ports List <ports@FreeBSD.ORG>, Seigo Tanimura <tanimura@r.dl.itc.u-tokyo.ac.jp> Subject: Re: troubles with the FAM port Message-ID: <200207270421.g6R4LZ3K046239@silver.carrots.uucp.r.dl.itc.u-tokyo.ac.jp> In-Reply-To: <20020718182425.GA41703@wwweasel.geeksrus.net> References: <200207181631.g6IGVLJ1037421@250-217.customer.cloud9.net> <20020718182425.GA41703@wwweasel.geeksrus.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--Multipart_Sat_Jul_27_13:21:34_2002-1
Content-Type: text/plain; charset=US-ASCII
On Thu, 18 Jul 2002 14:24:25 -0400,
Alan E <alane@geeksrus.net> said:
>> . configure failing due to mountlist issues --
>> solved by changing <rpcsvc/mount.h> in configure.in
>> to <sys/types.h> and <sys/mount.h>;
Alan> Hmm. The file has changed locations? Or is there more than one
Alan> mount.h?
Alan> . libfam/Client.h failing to compile for a whole bunch
>> of hard to decipher errors/warnings -- gave up.
Alan> This is not useful at all. Why not include the compiler output?
Those were due to a duplicated __BEGIN_DECLS in
/usr/include/rpc/clnt.h. It is fixed in src/include/rpc/clnt.h rev
1.20:
----------------------------
revision 1.20
date: 2002/07/21 20:37:58; author: robert; state: Exp; lines: +0 -1
Remove duplicated '__BEGIN_DECLS' which obviated compiling
C++ sources that use this header.
Reported by: Jan Stocker <Jan.Stocker@t-online.de>
----------------------------
Other than those, attached is the patch to build with the system and
portbld gcc 3.1, and to catch up to assert() in -current.
--Multipart_Sat_Jul_27_13:21:34_2002-1
Content-Type: text/patch; type=patch; charset=US-ASCII
Content-Disposition: attachment; filename="fam.diff"
Content-Transfer-Encoding: 7bit
Index: files/patch-fam-Log.c++
===================================================================
RCS file: /home/ncvs/ports/devel/fam/files/patch-fam-Log.c++,v
retrieving revision 1.1
diff -u -r1.1 patch-fam-Log.c++
--- files/patch-fam-Log.c++ 9 Jun 2002 08:29:40 -0000 1.1
+++ files/patch-fam-Log.c++ 27 Jul 2002 04:20:10 -0000
@@ -1,12 +1,43 @@
-diff -ruN fam/Log.c++ fam/Log.c++
---- fam/Log.c++ Wed May 29 00:20:30 2002
-+++ fam/Log.c++ Sat Jun 8 16:31:07 2002
-@@ -28,6 +28,8 @@
+--- fam/Log.c++.orig Wed May 29 13:20:30 2002
++++ fam/Log.c++ Sat Jul 27 13:12:36 2002
+@@ -28,6 +28,9 @@
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
++#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/types.h>
#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/time.h>
+@@ -260,15 +263,30 @@
+ }
+
+ #ifndef NDEBUG
++#if defined(__assert)
++#undef __assert
++#endif /* __assert */
+
+ // New back end for assert() will log to syslog, put core file
+ // in known directory.
+
++/* XXX This is not exact, but should be close enough. */
++#if __FreeBSD_version >= 500027
++void __assert(const char *msg, const char *file, int line, const char *failedexpr)
++{
++ char *dirname = new char[strlen(Log::getName()) + 20];
++ (void) sprintf(dirname, "/usr/tmp/%s.%d", Log::getName(), getpid());
++ if (msg == NULL)
++ Log::error("Assertion failed: (%s), file %s, line %d", failedexpr, file, line);
++ else
++ Log::error("Assertion failed: (%s), msg %s, file %s, line %d", failedexpr, msg, file, line);
++#else
+ void __assert(const char *msg, const char *file, int line)
+ {
+ char *dirname = new char[strlen(Log::getName()) + 20];
+ (void) sprintf(dirname, "/usr/tmp/%s.%d", Log::getName(), getpid());
+ Log::error("Assertion failed at %s line %d: %s", file, line, msg);
++#endif
+ Log::error("Dumping core in %s/core", dirname);
+
+ if (setreuid(0, 0) < 0)
Index: files/patch-fam-Scheduler.h
===================================================================
RCS file: /home/ncvs/ports/devel/fam/files/patch-fam-Scheduler.h,v
retrieving revision 1.1
diff -u -r1.1 patch-fam-Scheduler.h
--- files/patch-fam-Scheduler.h 9 Jun 2002 08:29:40 -0000 1.1
+++ files/patch-fam-Scheduler.h 27 Jul 2002 04:20:10 -0000
@@ -1,6 +1,5 @@
-diff -ruN fam/Scheduler.h fam/Scheduler.h
---- fam/Scheduler.h Mon Apr 29 02:26:54 2002
-+++ fam/Scheduler.h Sat Jun 8 16:31:07 2002
+--- fam/Scheduler.h.orig Mon Apr 29 15:26:54 2002
++++ fam/Scheduler.h Fri Jul 26 21:50:32 2002
@@ -24,6 +24,7 @@
#define Scheduler_included
@@ -9,3 +8,18 @@
#include "Boolean.h"
+@@ -104,11 +105,11 @@
+ // for the corresponding I/O type.
+
+ struct IOTypeInfo {
+- FDInfo::FDIOHandler FDInfo::*const iotype;
++ FDInfo::FDIOHandler FDInfo::* iotype;
+ unsigned int nbitsset; // number of bits set in fds
+ fd_set fds;
+- IOTypeInfo(FDInfo::FDIOHandler FDInfo::* a_iotype) :
+- iotype(a_iotype), nbitsset(0) { FD_ZERO(&fds); }
++ IOTypeInfo(FDInfo::FDIOHandler FDInfo::* a_iotype)
++ { iotype = a_iotype; nbitsset = 0; FD_ZERO(&fds); };
+ };
+
+ struct onetime_task {
--Multipart_Sat_Jul_27_13:21:34_2002-1
Content-Type: text/plain; charset=US-ASCII
--
Seigo Tanimura <tanimura@r.dl.itc.u-tokyo.ac.jp> <tanimura@FreeBSD.org>
--Multipart_Sat_Jul_27_13:21:34_2002-1--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207270421.g6R4LZ3K046239>