[ooo-build-commit] Branch 'ooo/OOO320' - 4 commits - expat/expat-2.0.1.patch nss/dtoa.patch nss/makefile.mk
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Dec 16 18:38:31 PST 2009
expat/expat-2.0.1.patch | 12 +++--
nss/dtoa.patch | 110 ------------------------------------------------
nss/makefile.mk | 2
3 files changed, 9 insertions(+), 115 deletions(-)
New commits:
commit 88f9f57d11f0e5e8a1062dbc6f1eede486f9f907
Author: Release Engineers <releng at openoffice.org>
Date: Wed Dec 16 12:08:20 2009 +0000
#i10000# fix for building in SO environment only
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
index 57aa164..9ed7413 100644
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.0.1.patch
@@ -1,6 +1,6 @@
--- misc/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008
+++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008
-@@ -1 +1,89 @@
+@@ -1 +1,93 @@
-dummy
+#*************************************************************************
+#
@@ -51,6 +51,10 @@
+CDEFS+=-DHAVE_EXPAT_CONFIG_H
+.ENDIF
+
++.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!=""
++CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY
++.ENDIF # "$(OS)"=="MACOSX"
++
+SLOFILES=$(SLO)$/xmlparse.obj \
+ $(SLO)$/xmlrole.obj \
+ $(SLO)$/xmltok.obj
commit d3ecf32fb3535775c089f1811c12cb4eb35b300a
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Dec 15 15:26:20 2009 +0000
#i10000# LIB2 instead of LIB3 fox x64
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
index 8f7ae18..57aa164 100644
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.0.1.patch
@@ -83,8 +83,8 @@
+CFLAGS_X64+=-I..
+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
+LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
-+LIB3TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
-+LIB3OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
++LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
++LIB2OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
+.ENDIF # "$(BUILD_X64)"!=""
+
+# --- Targets ------------------------------------------------------
commit 577f3b70fdc066f3db028cf0d87fccf7870fe61b
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Dec 15 06:49:54 2009 +0000
#i107668# build breaks for windows amd64
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
index 1be45d1..8f7ae18 100644
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.0.1.patch
@@ -79,7 +79,7 @@
+SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \
+ $(SLO_X64)$/xmlrole.obj \
+ $(SLO_X64)$/xmltok.obj
-+CDEFS_X64+=-DXML_UNICODE
++CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP
+CFLAGS_X64+=-I..
+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
+LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
commit 1b6b89188ac923432cec9226a73203da22776df5
Author: Release Engineers <releng at openoffice.org>
Date: Mon Dec 14 14:08:08 2009 +0000
#i10000# dtoa.patch obsolete
diff --git a/nss/dtoa.patch b/nss/dtoa.patch
deleted file mode 100644
index 3632df3..0000000
--- a/nss/dtoa.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- misc/mozilla/nsprpub/pr/src/misc/prdtoa.c 20 Mar 2009 03:41:21 -0000 4.7
-+++ misc/build/mozilla/nsprpub/pr/src/misc/prdtoa.c 15 Sep 2009 00:10:20 -0000
-@@ -169,17 +169,22 @@ void _PR_CleanupDtoa(void)
- * Llong, #define #ULLong to be the corresponding unsigned type.
- * #define KR_headers for old-style C function headers.
- * #define Bad_float_h if your system lacks a float.h or if it does not
- * define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
- * FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
- * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)
- * if memory is available and otherwise does something you deem
- * appropriate. If MALLOC is undefined, malloc will be invoked
-- * directly -- and assumed always to succeed.
-+ * directly -- and assumed always to succeed. Similarly, if you
-+ * want something other than the system's free() to be called to
-+ * recycle memory acquired from MALLOC, #define FREE to be the
-+ * name of the alternate routine. (FREE or free is only called in
-+ * pathological cases, e.g., in a dtoa call after a dtoa return in
-+ * mode 3 with thousands of digits requested.)
- * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making
- * memory allocations from a private pool of memory when possible.
- * When used, the private pool is PRIVATE_MEM bytes long: 2304 bytes,
- * unless #defined to be a different length. This default length
- * suffices to get rid of MALLOC calls except for unusual cases,
- * such as decimal-to-binary conversion of a very long string of
- * digits. The longest string dtoa can return is about 751 bytes
- * long. For conversions by strtod of strings of 800 digits and
-@@ -553,17 +558,17 @@ extern double rnd_prod(double, double),
- #endif
- #endif /* NO_LONG_LONG */
-
- #ifndef MULTIPLE_THREADS
- #define ACQUIRE_DTOA_LOCK(n) /*nothing*/
- #define FREE_DTOA_LOCK(n) /*nothing*/
- #endif
-
--#define Kmax 15
-+#define Kmax 7
-
- struct
- Bigint {
- struct Bigint *next;
- int k, maxwds, sign, wds;
- ULong x[1];
- };
-
-@@ -581,27 +586,28 @@ Balloc
- {
- int x;
- Bigint *rv;
- #ifndef Omit_Private_Memory
- unsigned int len;
- #endif
-
- ACQUIRE_DTOA_LOCK(0);
-- if (rv = freelist[k]) {
-+ /* The k > Kmax case does not need ACQUIRE_DTOA_LOCK(0), */
-+ /* but this case seems very unlikely. */
-+ if (k <= Kmax && (rv = freelist[k]))
- freelist[k] = rv->next;
-- }
- else {
- x = 1 << k;
- #ifdef Omit_Private_Memory
- rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
- #else
- len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
- /sizeof(double);
-- if (pmem_next - private_mem + len <= PRIVATE_mem) {
-+ if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) {
- rv = (Bigint*)pmem_next;
- pmem_next += len;
- }
- else
- rv = (Bigint*)MALLOC(len*sizeof(double));
- #endif
- rv->k = k;
- rv->maxwds = x;
-@@ -615,20 +621,28 @@ Balloc
- Bfree
- #ifdef KR_headers
- (v) Bigint *v;
- #else
- (Bigint *v)
- #endif
- {
- if (v) {
-- ACQUIRE_DTOA_LOCK(0);
-- v->next = freelist[v->k];
-- freelist[v->k] = v;
-- FREE_DTOA_LOCK(0);
-+ if (v->k > Kmax)
-+#ifdef FREE
-+ FREE((void*)v);
-+#else
-+ free((void*)v);
-+#endif
-+ else {
-+ ACQUIRE_DTOA_LOCK(0);
-+ v->next = freelist[v->k];
-+ freelist[v->k] = v;
-+ FREE_DTOA_LOCK(0);
-+ }
- }
- }
-
- #define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
- y->wds*sizeof(Long) + 2*sizeof(int))
-
- static Bigint *
- multadd
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 4487f6c..c636139 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -47,7 +47,7 @@ all:
TARFILE_NAME=nss_3_12_5
TARFILE_ROOTDIR=mozilla
-PATCH_FILES=nss.patch dtoa.patch
+PATCH_FILES=nss.patch
# Note: dtoa.patch fixes https://bugzilla.mozilla.org/show_bug.cgi?id=516396. It can be removed as soon as
# we upgrade to a new NSS version which already contains this fix.
More information about the ooo-build-commit
mailing list