1050086 - C-c needs a "port" of bug 1047267

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Mike Hommey [:glandium]]

See the config/external/*/* parts of https://hg.mozilla.org/integration/mozilla-inbound/rev/6b285759568c

Comment 1

[Ian Neal]

Attachment: Port EXTRA_LIBS changes

For some reason I had an extra 'nspr' USE_LIBS to mailnews/base/test/moz.build
I have preserved whether nspr is in or out of MOZ_INCOMPLETE_EXTERNAL_LINKAGE with the transition.

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8469716 [details] [diff] [review]
Port EXTRA_LIBS changes

Review of attachment 8469716 [details] [diff] [review]:
-----------------------------------------------------------------

::: ldap/xpcom/src/Makefile.in
@@ +17,5 @@
>  ifdef MOZ_PREF_EXTENSIONS
>  DEFINES += -DMOZ_PREF_EXTENSIONS
>  endif
>  
>  EXTRA_LIBS += $(LDAP_LIBS)

You need to address this too.

Comment 3

[Joshua Cranmer [:jcranmer]]

(In reply to Mike Hommey [:glandium] from comment #2)
> Comment on attachment 8469716 [details] [diff] [review]
> Port EXTRA_LIBS changes
> 
> Review of attachment 8469716 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: ldap/xpcom/src/Makefile.in
> @@ +17,5 @@
> >  ifdef MOZ_PREF_EXTENSIONS
> >  DEFINES += -DMOZ_PREF_EXTENSIONS
> >  endif
> >  
> >  EXTRA_LIBS += $(LDAP_LIBS)
> 
> You need to address this too.

So it looks offhand like ldap/Makefile.in + ldap/moz.build serve the same role as config/external/*. Copying and tweaking config/external/nsprpub for LDAP should suffice.

Comment 4

[Joshua Cranmer [:jcranmer]]

Comment on attachment 8469716 [details] [diff] [review]
Port EXTRA_LIBS changes

Review of attachment 8469716 [details] [diff] [review]:
-----------------------------------------------------------------

I think I'd like to see the LDAP situation resolved before checking this in.

Comment 5

[Patrick Cloke [:clokep]]

Would anyone mind if I push the im/ only parts (r=me) as a separate commit? It's the only thing still busted for Windows/Linux Instantbird. Thanks!

Comment 6

[Florian Quèze [:florian]]

Joshua, how do you feel about comment 5?

Comment 7

[Joshua Cranmer [:jcranmer]]

Fine with me.

Comment 8

[Patrick Cloke [:clokep]]

I pushed the im-only parts of this as https://hg.mozilla.org/comm-central/rev/858177b04fd9

Comment 9

[Ian Neal]

Attachment: Port EXTRA_LIBS changes and do LDAP too [Checked in: Comment 15]

Tested locally for linux
Run on try:
Green for Windows https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=d7bc15e0c081
Waiting for OS X https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=03d011cd592b

Comment 10

[Ian Neal]

(In reply to Ian Neal from comment #9)
> Waiting for OS X
> https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=03d011cd592b
Failed due to infra fail, will have to re-try once the infra is available again.

Comment 11

[Ian Neal]

Another push to try for OS X
https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=646f50dbe049

Comment 12

[Mike Hommey [:glandium]]

Comment on attachment 8472007 [details] [diff] [review]
Port EXTRA_LIBS changes and do LDAP too [Checked in: Comment 15]

You can remove MOZ_APP_COMPONENT_MODULES too.

Comment 13

[Mike Hommey [:glandium]]

And you can file a bug to have MOZ_APP_COMPONENT_MODULES and MOZ_APP_EXTRA_LIBS removed from m-c.

Comment 14

[Joshua Cranmer [:jcranmer]]

Comment on attachment 8472007 [details] [diff] [review]
Port EXTRA_LIBS changes and do LDAP too [Checked in: Comment 15]

Review of attachment 8472007 [details] [diff] [review]:
-----------------------------------------------------------------

You can kill the MOZ_APP_COMPONENT_MODULES stuff, but that's best left to a follow up, I think.

::: ldap/moz.build
@@ +19,5 @@
> +    USE_LIBS += [
> +        '/ldap/sdks/c-sdk/ldap/libraries/libldap/ldap60',
> +        '/ldap/sdks/c-sdk/ldap/libraries/libldif/ldif60',
> +        '/ldap/sdks/c-sdk/ldap/libraries/libprldap/prldap60',
> +    ]

Adding USE_LIBS += ['nspr'] may be useful.

::: mailnews/imap/test/Makefile.in
@@ -12,5 @@
>  include $(DEPTH)/config/autoconf.mk
>  
>  include $(topsrcdir)/config/rules.mk
> -
> -EXTRA_LIBS += $(NSPR_LIBS)

Delete this makefile too, please.

Comment 15

[Ian Neal]

Comment on attachment 8472007 [details] [diff] [review]
Port EXTRA_LIBS changes and do LDAP too [Checked in: Comment 15]

http://hg.mozilla.org/comm-central/rev/7ad2fba944f1