Date: Sat, 4 May 2002 21:17:28 -0400 (EDT) From: Andrew Gallatin <gallatin@cs.duke.edu> To: will@freebsd.org Cc: freebsd-alpha@freebsd.org Subject: kdebase3 Message-ID: <15572.34856.613733.817001@grasshopper.cs.duke.edu>
next in thread | raw e-mail | index | archive | help
Hi,
I've mangaged to get kdebase3 building on alpha.
The following patch creates 2 new patch files
(files/patch-ksysgaurd-ksysgaurdd-FreeBSD-apm.c,
files/patch-ksysgaurd-ksysgaurdd-modules.h) to make building apm
support contingent on building for i386 (AFAIK, no platform but x86
has apm support). Attempting to build apm support breaks the build
because other platforms lack the <machine/apm_bios.h> include.
The patch to the Makefile attempts to rid -O2 from the build CFLAGS
and CXXFLAGS. This may also require an autoconf to be patched.
In addition to -O2 being unsupported on FreeBSD, it causes the
compiler to whine on alpha. This, in turn, causes libtool to
configure itself incorrectly on alpha, leading to build breakage where
konsole.o cannot be linked.
The resulting KDE binaries seem to work (I've really only tried
konqueror for a few seconds). Konqueror crashes with a SIGFPE on some
javascript based pages just like Konqueror from KDE 2.2 does; I'm
going to try adding -mieee to the cflags to see if I can fix this
issue (it worked for KDE2.2). BTW, kde3 seems really pretty. ;)
Anyway, can you commit what I have so far so that it doesn't get lost,
please?
Thanks,
Drew
PS: What do I need to do to turn off all the spam kde apps spew when
they run. EG:
<..>
DCOP: register 'kbuildsycoca' -> number of clients is now 5
DCOP: register 'anonymous-64011' -> number of clients is now 6
kbuildsycoca: checking file timestamps
kbuildsycoca: timestamps check ok
<..>
--- /dev/null Sat May 4 18:29:02 2002
+++ files/patch-ksysgaurd-ksysgaurdd-FreeBSD-apm.c Sat May 4 16:55:09 2002
@@ -0,0 +1,16 @@
+--- ksysguard/ksysguardd/FreeBSD/apm.c.orig Sat May 4 16:53:10 2002
++++ ksysguard/ksysguardd/FreeBSD/apm.c Sat May 4 16:53:42 2002
+@@ -18,7 +18,7 @@
+
+ $Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $
+ */
+-
++#ifdef __i386__
+ #include <fcntl.h>
+ #include <machine/apm_bios.h>
+ #include <stdio.h>
+@@ -96,3 +96,4 @@
+ {
+ fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n");
+ }
++#endif /* __i386__ */
--- /dev/null Sat May 4 18:29:10 2002
+++ files/patch-ksysgaurd-ksysgaurdd-modules.h Sat May 4 16:57:44 2002
@@ -0,0 +1,32 @@
+--- ksysguard/ksysguardd/modules.h.orig Sat May 4 16:49:24 2002
++++ ksysguard/ksysguardd/modules.h Sat May 4 16:52:34 2002
+@@ -45,7 +45,9 @@
+ #include "CPU.h"
+ #include "Memory.h"
+ #include "ProcessList.h"
++#ifdef __i386__
+ #include "apm.h"
++#endif
+ #include "diskstat.h"
+ #include "loadavg.h"
+ #include "logfile.h"
+@@ -104,13 +106,19 @@
+ { "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC },
+ { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC },
+ { "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC },
++#ifdef __i386__
+ { "Apm", initApm, exitApm, updateApm, NULLVVFUNC },
++#endif
+ { "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat },
+ { "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC },
+ { "LogFile", initLogFile, exitLogFile, NULLVVFUNC, NULLVVFUNC },
+ { "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev },
+ };
++#ifdef __i386__
+ #define NUM_MODULES 8
++#else
++#define NUM_MODULES 7
++#endif
+ #endif /* OSTYPE_FreeBSD */
+
+ #ifdef OSTYPE_Solaris
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/kdebase3/Makefile,v
retrieving revision 1.95
diff -u -r1.95 Makefile
--- Makefile 21 Apr 2002 23:45:56 -0000 1.95
+++ Makefile 4 May 2002 22:18:17 -0000
@@ -59,6 +59,12 @@
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+pre-configure:
+ ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/configure
+ ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/aclocal.m4
+ ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in
+ ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/libtool.m4.in
+
post-configure:
${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-alpha" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?15572.34856.613733.817001>