Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
14 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Don Lewis-2
On 19 Mar, [hidden email] wrote:

> Author: jim
> Date: Mon Mar 19 16:53:04 2018
> New Revision: 1827215
>
> URL: http://svn.apache.org/viewvc?rev=1827215&view=rev
> Log:
> Use gcc3 for COMID for macOS/OSX
>
> Modified:
>     openoffice/trunk/main/configure.ac
>     openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
>
> Modified: openoffice/trunk/main/configure.ac
> URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1827215&r1=1827214&r2=1827215&view=diff
> ==============================================================================
> --- openoffice/trunk/main/configure.ac (original)
> +++ openoffice/trunk/main/configure.ac Mon Mar 19 16:53:04 2018
> @@ -2237,13 +2237,8 @@ case $COM in
>   CCNUMVER=`echo ${CCVER} | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;
>   # The version in tg_compv.mk for darwin does not look correct
>   # CCNUMVER = `echo ${CCVER} | sed -e"s/\.//";
> - if test "$build_os" == "darwin"; then
> - COMID="s5abi";
> - COMNAME="s5abi";
> - else
> - COMID="gcc3";
> - COMNAME="gcc3";
> - fi;;
> + COMID="gcc3";
> + COMNAME="gcc3";
>   MSC)
>   CCVER=`${CC} 2>&1 | $AWK -f ${_solenv}/bin/getcompver.awk`;
>   CCNUMVER=`${CC} 2>&1 | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;
>
> Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
> URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1827215&r1=1827214&r2=1827215&view=diff
> ==============================================================================
> --- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
> +++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Mon Mar 19 16:53:04 2018
> @@ -22,8 +22,6 @@
>  
>  
>  GUI := UNX
> -COM := S5ABI
> -COMID := s5abi
>  #COM := S5ABI
>  #COMID := s5abi
>  
>
>

I don't think this is correct.  As I recall the bridges code for Mac
uses s5abi.


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Jim Jagielski


> On Mar 19, 2018, at 6:47 PM, Don Lewis <[hidden email]> wrote:
>
> I don't think this is correct.  As I recall the bridges code for Mac
> uses s5abi.
>

As long as we remain consistent, we should be OK... Defaulting
to gcc3 seems to work better.

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Don Lewis-2
On 19 Mar, Jim Jagielski wrote:

>
>
>> On Mar 19, 2018, at 6:47 PM, Don Lewis <[hidden email]> wrote:
>>
>> I don't think this is correct.  As I recall the bridges code for Mac
>> uses s5abi.
>>
>
> As long as we remain consistent, we should be OK... Defaulting
> to gcc3 seems to work better.

Until my commit in r1826296, Mac was using s5abi.  There are still some
instances of s5abi lurking about in odk/setsdkenv_unix.sh.in and
odk/settings/settings.mk.  The bridges code for the Mac is under
bridges/source/cpp_uno/s5abi_macosx_x86-64, but is enabled by $(OS)$(CPU)
and not $(COMID) or $(COMNAME).


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Jim Jagielski
Yeah, I see that now... Before my commits, the macOS builds
broke mid-stream, due to the rdbmaker stuff, et.al... as could
be seen, there was places where macOS was using/expecting
gcc3 and others where it was s5abi. 4.1.5 seemed to use
s5abi universally, but so the issue was/is gcc3 slipping in
somewhere.

We do have bridges/source/cpp_uno/gcc3_macosx_intel


>
> Until my commit in r1826296, Mac was using s5abi.  There are still some
> instances of s5abi lurking about in odk/setsdkenv_unix.sh.in and
> odk/settings/settings.mk.  The bridges code for the Mac is under
> bridges/source/cpp_uno/s5abi_macosx_x86-64, but is enabled by $(OS)$(CPU)
> and not $(COMID) or $(COMNAME).
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Don Lewis-2
On 19 Mar, Jim Jagielski wrote:
> Yeah, I see that now... Before my commits, the macOS builds
> broke mid-stream, due to the rdbmaker stuff, et.al... as could
> be seen, there was places where macOS was using/expecting
> gcc3 and others where it was s5abi. 4.1.5 seemed to use
> s5abi universally, but so the issue was/is gcc3 slipping in
> somewhere.
>
> We do have bridges/source/cpp_uno/gcc3_macosx_intel

That's a 32-bit build.


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Jim Jagielski
OK, so what do I do? How to fix this? Any ideas?

> On Mar 19, 2018, at 7:58 PM, Don Lewis <[hidden email]> wrote:
>
> On 19 Mar, Jim Jagielski wrote:
>> Yeah, I see that now... Before my commits, the macOS builds
>> broke mid-stream, due to the rdbmaker stuff, et.al... as could
>> be seen, there was places where macOS was using/expecting
>> gcc3 and others where it was s5abi. 4.1.5 seemed to use
>> s5abi universally, but so the issue was/is gcc3 slipping in
>> somewhere.
>>
>> We do have bridges/source/cpp_uno/gcc3_macosx_intel
>
> That's a 32-bit build.
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Don Lewis-2
Either go back to the earlier code and change the equality test to a
case statement that matches darwin*, or change the other instances of
s5abi to gcc3.

On 19 Mar, Jim Jagielski wrote:

> OK, so what do I do? How to fix this? Any ideas?
>
>> On Mar 19, 2018, at 7:58 PM, Don Lewis <[hidden email]> wrote:
>>
>> On 19 Mar, Jim Jagielski wrote:
>>> Yeah, I see that now... Before my commits, the macOS builds
>>> broke mid-stream, due to the rdbmaker stuff, et.al... as could
>>> be seen, there was places where macOS was using/expecting
>>> gcc3 and others where it was s5abi. 4.1.5 seemed to use
>>> s5abi universally, but so the issue was/is gcc3 slipping in
>>> somewhere.
>>>
>>> We do have bridges/source/cpp_uno/gcc3_macosx_intel
>>
>> That's a 32-bit build.
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Jim Jagielski
The later doesn't help w/ the bridges stuff :/

I'll try to figure out where the gcc3 is leaking in and plug that.

> On Mar 19, 2018, at 8:10 PM, Don Lewis <[hidden email]> wrote:
>
> Either go back to the earlier code and change the equality test to a
> case statement that matches darwin*, or change the other instances of
> s5abi to gcc3.
>
> On 19 Mar, Jim Jagielski wrote:
>> OK, so what do I do? How to fix this? Any ideas?
>>
>>> On Mar 19, 2018, at 7:58 PM, Don Lewis <[hidden email]> wrote:
>>>
>>> On 19 Mar, Jim Jagielski wrote:
>>>> Yeah, I see that now... Before my commits, the macOS builds
>>>> broke mid-stream, due to the rdbmaker stuff, et.al... as could
>>>> be seen, there was places where macOS was using/expecting
>>>> gcc3 and others where it was s5abi. 4.1.5 seemed to use
>>>> s5abi universally, but so the issue was/is gcc3 slipping in
>>>> somewhere.
>>>>
>>>> We do have bridges/source/cpp_uno/gcc3_macosx_intel
>>>
>>> That's a 32-bit build.
>>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [hidden email]
>> For additional commands, e-mail: [hidden email]
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Don Lewis-2
On 19 Mar, Jim Jagielski wrote:
> The later doesn't help w/ the bridges stuff :/
>
> I'll try to figure out where the gcc3 is leaking in and plug that.

It is probably leaking in via the environment.  Did you rerun the script
to set the environment after re-running autoconf and configure?  In any
case, look for gcc3 in the environment.



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Matthias Seidel
In reply to this post by Jim Jagielski
Something is broken here (even with r1827253)...

When doing configure (on Windows) I get:

./configure: line 8147: syntax error near unexpected token `)'
./configure: line 8147: `       MSC)'

Regards,

   Matthias


Am 19.03.2018 um 23:56 schrieb Jim Jagielski:

>
>> On Mar 19, 2018, at 6:47 PM, Don Lewis <[hidden email]> wrote:
>>
>> I don't think this is correct.  As I recall the bridges code for Mac
>> uses s5abi.
>>
> As long as we remain consistent, we should be OK... Defaulting
> to gcc3 seems to work better.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Damjan Jovanovic
Does this patch help?

(Remember to re-run "autoconf")

On Tue, Mar 20, 2018 at 12:32 PM, Matthias Seidel <[hidden email]> wrote:
Something is broken here (even with r1827253)...

When doing configure (on Windows) I get:

./configure: line 8147: syntax error near unexpected token `)'
./configure: line 8147: `       MSC)'

Regards,

   Matthias


Am 19.03.2018 um 23:56 schrieb Jim Jagielski:
>
>> On Mar 19, 2018, at 6:47 PM, Don Lewis <[hidden email]> wrote:
>>
>> I don't think this is correct.  As I recall the bridges code for Mac
>> uses s5abi.
>>
> As long as we remain consistent, we should be OK... Defaulting
> to gcc3 seems to work better.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>





---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

configure-patch.txt (506 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Matthias Seidel

Works for me.

Thanks!


Am 20.03.2018 um 11:46 schrieb Damjan Jovanovic:
Does this patch help?

(Remember to re-run "autoconf")

On Tue, Mar 20, 2018 at 12:32 PM, Matthias Seidel <[hidden email]> wrote:
Something is broken here (even with r1827253)...

When doing configure (on Windows) I get:

./configure: line 8147: syntax error near unexpected token `)'
./configure: line 8147: `       MSC)'

Regards,

   Matthias


Am 19.03.2018 um 23:56 schrieb Jim Jagielski:
>
>> On Mar 19, 2018, at 6:47 PM, Don Lewis <[hidden email]> wrote:
>>
>> I don't think this is correct.  As I recall the bridges code for Mac
>> uses s5abi.
>>
> As long as we remain consistent, we should be OK... Defaulting
> to gcc3 seems to work better.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>





---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk

Damjan Jovanovic
Pleasure :).

Committed in r1827295.

On Tue, Mar 20, 2018 at 1:13 PM, Matthias Seidel <[hidden email]
> wrote:

> Works for me.
>
> Thanks!
>
> Am 20.03.2018 um 11:46 schrieb Damjan Jovanovic:
>
> Does this patch help?
>
> (Remember to re-run "autoconf")
>
> On Tue, Mar 20, 2018 at 12:32 PM, Matthias Seidel <
> [hidden email]> wrote:
>
>> Something is broken here (even with r1827253)...
>>
>> When doing configure (on Windows) I get:
>>
>> ./configure: line 8147: syntax error near unexpected token `)'
>> ./configure: line 8147: `       MSC)'
>>
>> Regards,
>>
>>    Matthias
>>
>>
>> Am 19.03.2018 um 23:56 schrieb Jim Jagielski:
>> >
>> >> On Mar 19, 2018, at 6:47 PM, Don Lewis <[hidden email]> wrote:
>> >>
>> >> I don't think this is correct.  As I recall the bridges code for Mac
>> >> uses s5abi.
>> >>
>> > As long as we remain consistent, we should be OK... Defaulting
>> > to gcc3 seems to work better.
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: [hidden email]
>> > For additional commands, e-mail: [hidden email]
>> >
>> >
>>
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>
>
Reply | Threaded
Open this post in threaded view
|

svn commit: r1825798

Matthias Seidel
Hi Damjan,

Regarding your commit for revision 1825798 [1]:

Since I updated config.guess/config.sub recently and dmake also contains
both files, would it hurt also to copy config.sub before building dmake?

I don't know if it is really necessary, but it would be more consistent.
(And it didn't break my local Windows builds ;-) )

Regards,

   Matthias

[1]
https://svn.apache.org/viewvc/openoffice/trunk/main/bootstrap.1?r1=1825798&r2=1825797&pathrev=1825798&diff_format=h



smime.p7s (5K) Download Attachment