You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2016/07/25 08:21:28 UTC
svn commit: r1753962 - in /openoffice/trunk/main: nss/makefile.mk
scp2/source/ooo/file_library_ooo.scp
Author: truckman
Date: Mon Jul 25 08:21:28 2016
New Revision: 1753962
URL: http://svn.apache.org/viewvc?rev=1753962&view=rev
Log:
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.
Modified:
openoffice/trunk/main/nss/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
Modified: openoffice/trunk/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/makefile.mk?rev=1753962&r1=1753961&r2=1753962&view=diff
==============================================================================
--- openoffice/trunk/main/nss/makefile.mk (original)
+++ openoffice/trunk/main/nss/makefile.mk Mon Jul 25 08:21:28 2016
@@ -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
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1753962&r1=1753961&r2=1753962&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Mon Jul 25 08:21:28 2016
@@ -1643,7 +1643,9 @@ SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWi
#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)