752895 - --enable-system-{sqlite,nss,nspr} results in make -C browser/installer failing

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Andrew Benton]

Attachment: Patch to put an #ifndef MOZ_NATIVE_SQLITE in package-manifest.in

User Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/15.0 Firefox/15.0a1
Build ID: 20120508010020

Steps to reproduce:

Added  --enable-system-sqlite to my mozconfig
ac_add_options --enable-system-sqlite
then when the build had finished I tried to
make -C browser/installer


Actual results:

Error: package error or possible missing or unnecessary file: bin/libmozsqlite3.so 
.....
make[1]: *** [stage-package] Error 255
make[1]: Leaving directory `/home/andy/save/src/firefox/firefox-build-dir/browser/installer'
make: *** [default] Error 2
make: Leaving directory `/home/andy/save/src/firefox/firefox-build-dir/browser/installer'



Expected results:

It should have made a nice new firefox tarball.
The attached patch fixes the problem for me.

Comment 1

[Andrew Benton]

Attachment: Added nspr and nss into the patch

--with-system-nspr and --with-system-nss also cause the installer to fail so I've added them into the patch

Comment 2

[Justin Wood (:Callek)]

You mentioned in Bug 763181 that no-one responded, so I peeked and I see why (not your fault)

#1 Was filed in Untriaged and our triage team didn't get to it, moved it to its correct component
#2 No-one was requested for review of the patch (see the Getting Reviews part of https://developer.mozilla.org/En/Developer_Guide/How_to_Submit_a_Patch )

I'll leave you to request since I don't know how well you tested these changes, a good reviewer here would be :khuey or :glandium imo.

Comment 3

[Mike Hommey [:glandium]]

Comment on attachment 631763 [details] [diff] [review]
Added nspr and nss into the patch

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

::: browser/installer/package-manifest.in
@@ +595,4 @@
>  @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
>  @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
>  @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
> +#endif

The #ifndef for this #endif is missing. Other than that, the patch looks good.

Comment 4

[Andrew Benton]

Attachment: added a missing #ifndef MOZ_NATIVE_NSS into the patch

(In reply to Mike Hommey [:glandium] from comment #3)
> Comment on attachment 631763 [details] [diff] [review]
> ::: browser/installer/package-manifest.in
> @@ +595,4 @@
> >  @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
> >  @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
> >  @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
> > +#endif
> 
> The #ifndef for this #endif is missing. Other than that, the patch looks
> good.

Many thanks, sorry for the missing #ifndef MOZ_NATIVE_NSS
Fixed in this version

Comment 5

[Mike Hommey [:glandium]]

Comment on attachment 631900 [details] [diff] [review]
added a missing #ifndef MOZ_NATIVE_NSS into the patch

Thanks for the patch. I'll land this alongside my next push (maybe some time tomorrow).

For your future patches, please follow the guidelines from https://developer.mozilla.org/en/Creating_a_patch_that_can_be_checked_in

Comment 6

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/ede54971747f

Comment 7

[Matt Brubeck (:mbrubeck)]

https://hg.mozilla.org/mozilla-central/rev/ede54971747f