rdbmaker issues

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

rdbmaker issues

Jim Jagielski
The migration of rdbmaker to build is causing issues w/ macOS:
It's looking for libuno_cppuhelpers5abi.dylib but what is being
created is libuno_cppuhelpersgcc3.dylib

No idea where the names are being generated or managed, since
the makefile uses


$(eval $(call gb_Executable_add_linked_libs,rdbmaker,\
                cppu \
                cppuhelper \
                reg \
                sal \
                salhelper \
                stl \
                $(gb_STDLIBS) \
))


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

Reply | Threaded
Open this post in threaded view
|

Re: rdbmaker issues

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

> The migration of rdbmaker to build is causing issues w/ macOS:
> It's looking for libuno_cppuhelpers5abi.dylib but what is being
> created is libuno_cppuhelpersgcc3.dylib
>
> No idea where the names are being generated or managed, since
> the makefile uses
>
>
> $(eval $(call gb_Executable_add_linked_libs,rdbmaker,\
> cppu \
> cppuhelper \
> reg \
> sal \
> salhelper \
> stl \
> $(gb_STDLIBS) \
> ))

This could be due to my changes to get away from tg_compv.mk.
configure.ac contains:

                if test "$build_os" == "darwin"; then
                        COMID="s5abi";
                        COMNAME="s5abi";
                else
                        COMID="gcc3";
                        COMNAME="gcc3";
                fi;;

Other places that look at $build_os allow for trailing stuff, so this
may need to be changed to some sort of wildcard match rather than strict
equality.


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

Reply | Threaded
Open this post in threaded view
|

Re: rdbmaker issues

Damjan Jovanovic
In reply to this post by Jim Jagielski
The name of the cppuhelpers library is generated in main/cppuhelper/source/
makefile.mk:

.IF "$(GUI)" == "WNT"
SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
.ELIF "$(GUI)" == "OS2"
SHL1TARGET=cppuh$(UDK_MAJOR)
.ELSE
SHL1TARGET=uno_$(TARGET)$(COMID)
.ENDIF

If this was an intentional change, you may also need to override the
library name in main/RepositoryFixes.mk.

On Mon, Mar 19, 2018 at 6:30 PM, Jim Jagielski <[hidden email]> wrote:

> The migration of rdbmaker to build is causing issues w/ macOS:
> It's looking for libuno_cppuhelpers5abi.dylib but what is being
> created is libuno_cppuhelpersgcc3.dylib
>
> No idea where the names are being generated or managed, since
> the makefile uses
>
>
> $(eval $(call gb_Executable_add_linked_libs,rdbmaker,\
>                 cppu \
>                 cppuhelper \
>                 reg \
>                 sal \
>                 salhelper \
>                 stl \
>                 $(gb_STDLIBS) \
> ))
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>
Reply | Threaded
Open this post in threaded view
|

Re: rdbmaker issues

Don Lewis-2
On 20 Mar, Damjan Jovanovic wrote:

> The name of the cppuhelpers library is generated in main/cppuhelper/source/
> makefile.mk:
>
> .IF "$(GUI)" == "WNT"
> SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
> .ELIF "$(GUI)" == "OS2"
> SHL1TARGET=cppuh$(UDK_MAJOR)
> .ELSE
> SHL1TARGET=uno_$(TARGET)$(COMID)
> .ENDIF

COMID should be s5abi here, but it sort of sounds like it is getting set
to gcc3 instead.

I see that main/solenv/inc/libs.mk also uses COMID, so the two *should*
match:

.IF "$(GUI)$(COM)"=="WNTGCC"
CPPULIB=-lcppu$(UDK_MAJOR)
CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
.ELIF "$(GUI)"=="OS2"
CPPULIB=-lcppu$(UDK_MAJOR)
CPPUHELPERLIB=-lcppuh$(UDK_MAJOR)
.ELSE                   # "$(GUI)$(COM)"=="WNTGCC"
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
.ENDIF                  # "$(GUI)$(COM)"=="WNTGCC"

> If this was an intentional change, you may also need to override the
> library name in main/RepositoryFixes.mk.

That doesn't seem to touch anything in the name after cppuhelper.

gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_
cppuhelper%,$(gb_Library_FILENAMES))

> On Mon, Mar 19, 2018 at 6:30 PM, Jim Jagielski <[hidden email]> wrote:
>
>> The migration of rdbmaker to build is causing issues w/ macOS:
>> It's looking for libuno_cppuhelpers5abi.dylib but what is being
>> created is libuno_cppuhelpersgcc3.dylib
>>
>> No idea where the names are being generated or managed, since
>> the makefile uses
>>
>>
>> $(eval $(call gb_Executable_add_linked_libs,rdbmaker,\
>>                 cppu \
>>                 cppuhelper \
>>                 reg \
>>                 sal \
>>                 salhelper \
>>                 stl \
>>                 $(gb_STDLIBS) \
>> ))
>>


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