Commit Graph

119 Commits

Author SHA1 Message Date
673205080e Make sure the nss build uses the ar and ranlib we want
The interaction of environment variables and make variables is fun.

For some reason, the
workdir/.../UnpackedTarball/nss/mozilla/nsprpub/configure script is
run twice: Once directly from nss/ExternalProject_nss.mk, once from
the sub-make run from nss/ExternalProject_nss.mk. In the first case,
the AR and RANLIB exported by the gbuild make process propagate just
fine to the configure script. In the latter case, not. So add AR and
RANLIB assignments on the sub-make command line (to override values
set in some of the nss makefiles), *and* make sure the sub-make
exports AR and RANLIB.

Change-Id: Ibd55bc8a7e001106e12b2207500e74c7bd01c73a
2013-06-26 14:19:40 +03:00
373d873c8f defuzz patch to apply again
Change-Id: I0b2253d3e23f6f2ec77c8aca88897144c59507a3
2013-06-14 16:00:13 +01:00
32565ee39b Bump maximum fuzz factor down to zero
Change-Id: I97d30afe3a24aab1123352da05b066095e5c86bb
2013-05-27 19:02:50 +03:00
f60af9ca6b Use a maximum fuzz factor of 1 for our patches to 3rd-party code
Change-Id: Id4639f1b0eefe5d433c84f48b7a1093fa17a3ba4
2013-05-27 16:39:41 +03:00
2bb3500284 Fix nss library paths for Mac OS X
nss uses hard-coded @executable_path (which is wrong, consider e.g. the case of
the URE uno executable), so patch it to use @_..._OOO instead (and no need to
set --prefix), and pass the resulting libs through macosx-change-install-names
(which requires the generated libs to be writable).

Change-Id: I0f04533f0f0581ee7b9dfd8929b8629c0842cc1b
2013-05-22 08:46:32 +02:00
09373d4583 soltools: remove Package_inc and empty unistd.h nonsense
Change-Id: Ic05de69951b28b9cc8d62f0a534b507c424e6b25
2013-05-10 17:56:24 +02:00
1a1f1fbdf0 gbuild: ExternalProject: remove second parameter again...
... now that everything is consistent.

Change-Id: I96c15159648815554280202eb1b6d274ead4e7b8
2013-05-07 01:41:26 +02:00
276021c761 gbuild: remove gb_ExternalProject_use_unpacked
It must always be used exactly once, so replace it with constructor
parameter.

Change-Id: Ifbe87065c19a5185a5705dc461656179002ece5d
2013-05-07 01:41:25 +02:00
8a5bdd8a74 libnsssysinit.so's presumably not needed in instdir
... because it's not installed either.

Change-Id: I282090e68ff2455b9593bbaba9ec1e16445f2b9d
2013-05-05 10:49:00 +02:00
491dea0a1f use gb_ExternalPackage_add_runtime_library for adding libs
Change-Id: I7be80bbef306db8f7ad585e95bfa4b6da0b30067
2013-05-01 16:55:38 +02:00
4811c2dc9f adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3

lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.

openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.

Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
2013-04-15 15:26:32 +02:00
75c2c58a6c add external for unistd.h
Change-Id: I728b162e21a7a2c02cb76af110cc0a01a762fdbd
2013-04-09 19:29:12 +02:00
07c9bb1038 Drop workarounds for Mac OS X SDKs 10.4 and 10.5
Change-Id: Ifa07f9b5613b4a75c5b72178cb276b9c0b495a62
2013-04-07 03:04:31 +03:00
7aa6f1b014 Remove Mac OS X for PowerPC support
Change-Id: I10b15141e6a5f93365e1cfa6fbc0c7cc3ea49b15
2013-04-03 21:13:17 +03:00
239fb4cb41 Try to fix python problems
"Octal literals are no longer of the form 0720; use 0o720 instead."
See http://docs.python.org/3.0/whatsnew/3.0.html
Seems ok with Python < 3

Change-Id: I588a9dcc4f4b447d5cb88eb6bb03ab2d598dc9f0
2013-03-27 18:56:00 +01:00
ede96bce22 fix mingw build of nss
Change-Id: I61ae51ef53321ed507dfc2974dc5bbfb72d3505e
2013-03-27 17:08:09 +01:00
3a7d870d72 file modes are octal
Change-Id: I5aa118db8100be8945425ad195bfb72819953c73
2013-03-27 17:08:09 +01:00
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
e482672b58 use system python for building if possible
Also simplifies configure, hopefully without any mistake;)

Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1
Reviewed-on: https://gerrit.libreoffice.org/2563
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-03-12 08:10:49 +00:00
7b84118102 fix access is denied error in nss on windows
Change-Id: I3b0ebab5e87897a9c29da4b3f97f7fb71cdd1751
2013-03-05 19:50:31 -05:00
2c6794e40d nss on windows needs soltool's unistd.h
Change-Id: I8c23fadc550091c834a873b53dbd3eae2ba8286e
2013-03-01 18:28:21 +01:00
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
ed26c01be1 quiet external module build log unless failure
ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Reviewed-on: https://gerrit.libreoffice.org/2304
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-22 08:25:56 +00:00
ea8c587f49 fix application of patches 2013-02-13 10:54:40 +01:00
4549f76d32 Revert "Don't bother with chmod() on Windows"
Argh, seems that it wasn't necessary after all.

This reverts commit 5bf437cd67d5fe2e4353069969cd99cc48e65730.
2013-02-06 15:28:43 +02:00
5bf437cd67 Don't bother with chmod() on Windows
It's fairly pointles to play with Unix rwxrwxrwx modes on Windows. One
never knows for sure how some emulation layer (Python's in this case)
guesstimates and mishandles the conversion to Windows ACLs. Not doing
them on Windows unbrokw the nss build. For me at least.

Change-Id: Id3a2f1755cd6f64bd681a3b4cb7f3c7abd3aa5b7
2013-02-06 15:10:44 +02:00
2baa4b333f nss: depend on python3
nss is not in tail_build because of moz, so expat, external, openssl and
python3 must go also out.

Change-Id: I52a3b02ff477ae52abc298d96770755ebc392d57
2013-01-07 22:42:24 +01:00
ddb4d8dff3 Revert "Depend on python3 (for Windows, but shouldn't hurt elsewhere I hope)"
Seems to cause even weirder problems in the tinderboxes.

This reverts commit e855dfbc3eb5a97ab57743a28b14555fd4b3375f.
2013-01-07 18:10:04 +02:00
e855dfbc3e Depend on python3 (for Windows, but shouldn't hurt elsewhere I hope)
Change-Id: I52a3b02ff477ae52abc298d96770755ebc392d57
2013-01-07 17:24:29 +02:00
6eff6fae62 Get rid of nsinstall hackery
This removes the need for using NSS Build Tools on windows.
It also removes the nees to build nss for the build system while cross
compiling.

Change-Id: I13c9fdb575223f2940d3e4eda00e77ba9158f2b7
Reviewed-on: https://gerrit.libreoffice.org/1534
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-01-07 09:22:15 +00:00
58e76a64b4 one more place for forcing windows path in nss build 2013-01-03 02:52:50 +01:00
dfbcb34441 force nss build to pass windows path to cl.exe
Not sure what's wrong exactly, but on one tinderbox cl fails because
of "unknown" argument (unix path to the source file). Work it around
by explicitly converting the path to windows path.
2013-01-03 02:36:41 +01:00
96e7e3564b add missing nss windows libs 2013-01-03 02:01:08 +01:00
ebaaefcbf3 try to sort out libsqlite3 handling in nss 2013-01-02 21:56:47 +01:00
3b1102ad19 looks like libnsssysinit is linux-only 2013-01-02 18:25:48 +01:00
e912ea714e try to fix nss on macosx 2013-01-02 18:06:18 +01:00
c003d25d24 convert nss to gbuild
Change-Id: I59edc4c437abccc201823d97f1cbec230d273b05
Reviewed-on: https://gerrit.libreoffice.org/1529
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-01-02 16:21:23 +00:00
c29098917a Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.

Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-25 17:53:25 +00:00
a0c53a961a First fix for fdo#56902
Restrict moz to windows, and build vars also
impacts nss, connectivity

Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282
Reviewed-on: https://gerrit.libreoffice.org/1233
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-04 10:53:36 +00:00
ed19103fd4 Convince nss to build with 64-bit MSVC
Change-Id: I1b840a03e87e1ca73239c0a3ee17741de97d1543
2012-11-03 14:58:29 +02:00
57fb462cea Don't let NSS use the MSVC debugging runtime in an --enable-debug build
In an MSVC build, not exporting BUILD_OPT to the Mozilla build
machinery causes the produced DLLs to use the debug CRT. The exact
mechanism is a bit of a mystery, and I didn't feel like spending too
much time trying to understand it.

Using the debug CRT is confusing and wrong. Nothing in LO otherwise
uses it. It also makes testing a build much harder for me at least, as
I do that in a fairly pristine virtual machine with no MSVC debugging
runtime available. (The normal CRT is bundled in the LO installer.)

Change-Id: I27f774d92a3986d40162c870202bcdddd94aa7c6
2012-11-01 15:07:42 +02:00
6b9e976368 fix library names on mingw
This is a bit hackish and could benefit from further cleanup.

Change-Id: Ibb8eddf88bffdea41fd94fea09ad6499d05ae715
2012-10-31 13:22:28 +01:00
46412b411d mangle file mode to avoid breaking rebuilds
Change-Id: Id436bdbf3a307a3a3c9735ad911e397a21ab701b
2012-10-30 15:25:20 +01:00
9da51784c9 fix mingw build of nss
Change-Id: Ic3bcc1297cde1c0680637d02c0e60528d2e60e52
2012-10-30 15:25:19 +01:00
6885fc51b9 Ccache doesn't like several -arch flags
So make sure just one is passed to the compiler.

Change-Id: I217b7ac34ba20e35a23c18df6b497919061ca44c
2012-10-15 08:06:53 +03:00
c96b4c550d Handle cross-compilation of nss (for desktop OSes)
A bit messy, but then so is the nss configuration and build mechanism.

Change-Id: If2259e3da81521a2f87a5b312c6acd9d40e75ae5
2012-10-14 23:49:11 +03:00
9b95cd5ada nss depends on soltools
Change-Id: Ic532b35cf282186843d886fda578bb20845db415
2012-10-02 17:57:17 +02:00
9b74656d01 Start on experimental support for 64-bit Mac code
Rename the --enable-cl-x64 switch to --enable-64-bit and make its
meaning more generic. Drop the CL_X64 config variable, introduce the
more generic BITNESS_OVERRIDE instead.

Does not build yet.

Change-Id: Iac66afe31dceaf40c8262fec2e5aef6a751ba3d2
2012-09-19 21:50:09 +03:00
b888512fcb Fix -Wl,-z,origin -Wl,-rpath,... quoting
Change-Id: I65eac6ab34d2d54eeaa2bc14838711f700d0d535
2012-08-30 08:29:18 +02:00
54928e1745 Mingw build is cross-compiling, not using cygwin
Change-Id: Icc0b617bd639666e44effbb4554bb4f7f0e778e8
2012-08-29 14:53:22 +02:00