Date: Thu, 12 Aug 2004 05:44:51 +0200 From: Bartosz Fabianowski <freebsd@chillt.de> To: Bartosz Fabianowski <freebsd@chillt.de> Cc: openoffice@FreeBSD.org Subject: -CURRENT fixes (was: Re: openoffice-1.1 build more broken thanusual on 5.2-CURRENT) Message-ID: <411AE7B3.5020009@chillt.de> In-Reply-To: <411AD533.6000406@chillt.de> References: <200408120119.i7C1JRbC018760@gw.catspoiler.org> <411AD533.6000406@chillt.de>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------020004010106010702010508
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
The following patch two patches make openoffice-1.1 at least start
compiling on -CURRENT for me again. I don't know yet if the build will
finish successfully, as it will take the whole night on my machine.
One of the patches simply removes the "BROKEN" keyword, of course. The
other patch prevents the main port's makefile from passing CFLAGS on the
command line to the mozilla sub port's make. This is necessary, because
once passed on the command line, the CFLAGS become pretty much
read-only, while the mozilla sub port expects to be able to change them
at will. This patch shouldn't cause any loss in functionality for the
fragile build system, because the main port didn't actually modify the
CFLAGS in any way as far as I can tell, so the passing was unnecessary
to begin with.
Now, if my approach is totally wrong, feel free to correct me. I have
never hacked on makefiles and I am not even pretending to understand
what I'm doing here :).
- Bartosz
--------------020004010106010702010508
Content-Type: text/plain;
name="patch-openoffice-1.1-Makefile"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-openoffice-1.1-Makefile"
--- Makefile.orig Thu Aug 12 05:31:32 2004
+++ Makefile Thu Aug 12 05:31:43 2004
@@ -53,10 +53,6 @@
helpcontent_90_unix.tgz
.endif
-.if ${OSVERSION} > 502010
-BROKEN= "Does not compile on 5-current"
-.endif
-
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
BUILD_NR= 645
--------------020004010106010702010508
Content-Type: text/plain;
name="patch-openoffice-1.1-files-Makefile.mozilla"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-openoffice-1.1-files-Makefile.mozilla"
--- Makefile.mozilla.orig Thu Aug 12 05:33:02 2004
+++ Makefile.mozilla Thu Aug 12 05:33:13 2004
@@ -21,9 +21,9 @@
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
.endif
.if defined(USE_GCC)
- @cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
+ @cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
.else
- @cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
+ @cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" build WRKDIRPREFIX=""
.endif
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
--------------020004010106010702010508--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?411AE7B3.5020009>