Closed Bug 884825 Opened 7 years ago Closed 7 years ago

Move LIBRARY_NAME to moz.build in c-c

Categories

(MailNews Core :: Build Config, defect)

x86_64
Linux
defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 26.0

People

(Reporter: jcranmer, Assigned: jcranmer)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

Attached patch MigrationSplinter Review
I'm going to do a try run with this patch applied, since it changes some OS_CXXFLAGS in imap/ as well to get it to work.
Attachment #764743 - Flags: review?(mbanner)
Comment on attachment 764743 [details] [diff] [review]
Migration

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

r=me with either an explanation of the mapi stuff, or an appropriate fix.

::: mailnews/mapi/mapihook/build/moz.build
@@ +3,5 @@
>  # License, v. 2.0. If a copy of the MPL was not distributed with this
>  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
>  
>  MODULE = 'MapiProxy'
> +LIBRARY_NAME = MODULE

That's a little weird. Are you sure this shouldn't just be unset / not present? (same in the other mapi file).
Attachment #764743 - Flags: review?(mbanner) → review+
LIBRARY_NAME is needed to build the libraries. I think MODULE may be unnecessary (although it is mentioned in version.mk for RCFILE), but I'm wary of breaking any changes here.
applying bug884825migrate-library-name.patch
patching file calendar/base/backend/libical/Makefile.in
patching file calendar/base/backend/libical/build/Makefile.in
patching file calendar/base/backend/libical/build/moz.build
Hunk #1 FAILED at 4
1 out of 1 hunks FAILED -- saving rejects to file db/mork/build/Makefile.in.rej
patching file calendar/base/backend/libical/moz.build
patching file calendar/libical/src/libical/Makefile.in
patching file calendar/libical/src/libical/moz.build
patching file db/mork/build/Makefile.in
patching file db/mork/build/moz.build
patching file db/mork/src/Makefile.in
Hunk #1 FAILED at 4
1 out of 1 hunks FAILED -- saving rejects to file db/mork/src/Makefile.in.rej
Hunk #1 FAILED at 4
1 out of 1 hunks FAILED -- saving rejects to file ldap/xpcom/src/Makefile.in.rej
Hunk #1 succeeded at 25 with fuzz 2 (offset -2 lines).
Hunk #1 FAILED at 6
1 out of 1 hunks FAILED -- saving rejects to file mail/components/build/Makefile.in.rej
patching file db/mork/src/moz.build
patching file ldap/xpcom/src/Makefile.in
patching file ldap/xpcom/src/moz.build
patching file mail/components/build/Makefile.in
patching file mail/components/build/moz.build
patching file mail/components/migration/src/Makefile.in
patching file mail/components/migration/src/moz.build
Hunk #1 FAILED at 17
1 out of 1 hunks FAILED -- saving rejects to file mail/components/search/Makefile.in.rej
Hunk #1 FAILED at 2
1 out of 1 hunks FAILED -- saving rejects to file mail/components/search/moz.build.rej
Hunk #1 FAILED at 4
1 out of 1 hunks FAILED -- saving rejects to file mailnews/addrbook/src/Makefile.in.rej
Need to rebase on top of Bug 901752
https://hg.mozilla.org/comm-central/rev/e7a7f385ce1c
Status: ASSIGNED → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 26.0
You need to log in before you can comment on or make changes to this bug.