diff options
| author | Don Lewis <truckman@apache.org> | 2016-07-25 08:21:28 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@apache.org> | 2016-07-25 08:21:28 +0000 |
| commit | e0667bfaf22f7535bb4b73d33039cc53ea1e4426 (patch) | |
| tree | bf1fc611c2334cd2da1deca372bc03511b5f1201 | |
| parent | 9813bbc278e11149aa0519750f2496f1b3d5ab89 (diff) | |
The nss upgrade in r1753163 broke packaging on Windows (if nss is
enabled, which it is not by default) and Mac (not actually verified).
These two platforms do not build a separate libfreeblpriv3.so (or
Windows equivalent) but instead bundle it into libfreebl3.so. Since a
separate libfreeblpriv3.so is only required on Linux (see #i105566# and
moz#513024#), only attempt to package this library on Linux. Since a
separate libfreeblpriv3.so does not seem to be required on FreeBSD,
don't build it there.
Notes
Notes:
ignore: obsolete
| -rw-r--r-- | nss/makefile.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 5d7ee1487004..eb9aaa59214d 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -73,7 +73,7 @@ PATCH_FILES+=nss_linux.patch .ENDIF .IF "$(OS)"=="FREEBSD" -BUILD_ACTION+=FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1 +BUILD_ACTION+=NSS_DISABLE_GTESTS=1 .ENDIF diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 195856388374..50902a9d3f4e 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1643,7 +1643,9 @@ SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin ) #ifdef BUNDLE_NSS_LIBS STD_LIB_FILE( gid_File_Lib_Freebl3, freebl3) +#ifdef LINUX STD_LIB_FILE( gid_File_Lib_Freeblpriv3, freeblpriv3) +#endif STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4) STD_LIB_FILE( gid_File_Lib_Nss3, nss3) STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi) |