On 01/17/2018 11:17 PM, Don Lewis wrote:
On 16 Jan, Kay Schenk wrote:
On 01/11/2018 11:24 PM, Don Lewis wrote:
The patch below moves the calculation of $CCNUMVER and some other
variables from main/solenv/inc/tg_compv.mk, where it is only usable by
dmake, to configure, where it can be used by both dmake and gbuild. This
is a requirement for me upstream some compiler bug workaround patches
from the FreeBSD port.
A bit of logic from set_soenv is also moved into configure. A bunch
more should probably be moved so that the configuration logic is not
spread across so many different places, but that can wait. Something
else to consider is that it would be nice to use a different value of
$COM for Apple's clang, maybe "ACLANG" or "APPLECLANG" since it has a
different version numbering scheme that the open-source version of clang
and having a unique identifier would simplify version checking when
applying compiler bug workarounds.
I've tested this patch on Windows, CentOS 6, and FreeBSD. It really
needs some testing on Mac and OS/2.
If you have an existing, populated build tree, then the most important
tests can be done without even doing a build. Start off by copying the
*env.set.sh script and solver/420/*/inc/comp_ver.mk to a safe location.
Next apply the patch below, run autoconf, and then run configure.
Compare the values of $COMNAME, $COMID, $CCNUMVER, and $CCVER from the
new *.env.set.sh with the values of those variables from the saved copy
of comp_ver.mk. Also compare the values of $COM in the new and saved
versions of *.env.set.sh.
Note: I think the old value of $CCNUMVER on the Mac is wrong. It should
look something like 000800010000 or 000700030000, depending on the
installed version.
Note that I changed -DCPPU_ENV on the Mac from $(COMID) to $(COMNAME)
for consistency with the dmake side. It shouldn't make a difference in
practice since both have the same value on the Mac.
If things look good, then please try a build with this patch.
I'm having problems applying these patches. :(
Can you add a new issue and attach all this as a text file.
https://bz.apache.org/ooo/show_bug.cgi?id=127664
Thanks. Additional comments in issue.
--
------------------------------------------
MzK
"Ring out the false, ring in the true."
-- poem "In Memoriam", Alfred Lord Tennyson
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org