Date: Sat, 4 May 2002 18:32:25 -0400 (EDT) From: Andrew Gallatin <gallatin@cs.duke.edu> To: obrien@FreeBSD.ORG Cc: freebsd-alpha@FreeBSD.ORG Subject: kdebase3 Message-ID: <15572.24953.530925.959853@grasshopper.cs.duke.edu> In-Reply-To: <20020504151121.A1813@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
David O'Brien writes:
> On Sat, May 04, 2002 at 05:32:59PM -0400, Andrew Gallatin wrote:
> > That causes configure to crap out complaining because -O -pipe isn't a
> > valid arg.
>
> Exact error?
ENOREMEMBER. It certainly doesn't work, though. Try it yourself &
see, if you like. I think the CFLAGS and CXXFLAGS variables are
already passed to configure.
>
> > At least for kde3, the O2's are hard-coded in the damned configure
> > scripts.
>
> Either these aren't GNU autoconf scripts; or the KDE people have really
> screwed with them.
Did I ever mention how much I HATE "configure". It takes forever &
its usually wrong. Grrr.
Anyway, what's happening seems to be the build process somehow causes
the configure script to get rebuilt after our port starts the build
(eg, the .configure_done.kdebase-3.0_1 is there _before_ the configure
script grows an "-O2" & is re-run).
I think our autoconf is part of the problem, as it sets the cflags to
O2. So, I've hit the autoconf port over the head with this patch:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/autoconf/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile 14 Mar 2002 13:29:00 -0000 1.30
+++ Makefile 4 May 2002 22:06:54 -0000
@@ -39,6 +39,9 @@
config.guess.1 \
config.sub.1 \
ifnames.1
+post-extract:
+ ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/lib/autoconf/c.m4
+ ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/lib/autoconf/fortran.m4
post-install:
.for FILE in ${GENERIC_TOOLS}
And the kdebase3 port with this:
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
I think that solves the O2 thing. At least a grep in the log file
hasn't shown any O2's yet. I'll see if konsole builds now.
I've also got patches for apm (appended) which I'll dump on wca as
soon as I get the damned thing to build.
Drew
--- /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
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.24953.530925.959853>