Date: 19 Jul 2003 22:09:14 +0200 From: Peter Kadau <peter.kadau@tuebingen.mpg.de> To: Kris Kennaway <kris@obsecurity.org> Cc: current@freebsd.org Subject: Re: Fixing gcc 3.3 compile failures -- kde ports proposal Message-ID: <1058645354.31104.18.camel@straycat> In-Reply-To: <20030718025200.GA36893@rot13.obsecurity.org> References: <20030718025200.GA36893@rot13.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi !
Luckily the KDE ports are very uniform.
Applying the obvious, trivial patch to configure always works on
current.
(Of course only since the patch utility is clever enough to
try the hunk at different offsets...):
--- configure.orig Sat Jul 19 16:54:39 2003
+++ configure Sat Jul 19 16:55:37 2003
@@ -4236,7 +4236,7 @@
CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-Wcast-align -Wconversion $CXXFLAGS"
;;
esac
- CXXFLAGS="-Wall -pedantic -W -Wpointer-arith
-Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
+ CXXFLAGS="-Wall -pedantic -fpermissive -W -Wpointer-arith
-Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
(Beware of newlines when doing cut-and-paste).
But that would break things on non-current.
So how about setting a variable in /etc/make.conf ?
I think for the time being this is not too much for
a current-user...
MY_CXX_BAILS_OUT_ON_KDE_CONFIGURE=yo
(It needn't be so long though ;-)
Then put that patch in the files directory as - e.g. -
`current-patch-configure'.
And change the ports Makefile along the lines of
the following patch for koffice:
--- Makefile.orig Sat Jul 19 21:48:15 2003
+++ Makefile Sat Jul 19 21:49:34 2003
@@ -38,4 +38,9 @@
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.ifdef MY_CXX_BAILS_OUT_ON_KDE_CONFIGURE
+pre-configure:
+ cd ${WRKSRC} && patch < ${FILESDIR}/current-patch-configure
+.endif
+
.include <bsd.port.mk>
With those settings, I could do a forced upgrade for everything.
I know this can't be the clean, now-we-all-are-happy-solution.
But as I already mentioned - for the time being...
Cheers
Peter
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1058645354.31104.18.camel>