diff options
| -rw-r--r-- | distribution/src/thirdparty/README | 64 | ||||
| -rw-r--r-- | distribution/src/thirdparty/db/patch.db.5.3.21 | 27 |
2 files changed, 25 insertions, 66 deletions
diff --git a/distribution/src/thirdparty/README b/distribution/src/thirdparty/README index e1d23e5de1b..ef4610c4765 100644 --- a/distribution/src/thirdparty/README +++ b/distribution/src/thirdparty/README @@ -6,12 +6,12 @@ Introduction ------------ This archive contains the source code distributions, including any -source patches, for the third-party packages required to build Ice on -Linux, OS X and Solaris. +source patches, for the third-party packages required to build Ice +on Linux and OS X. Note: this archive does not contain third-party packages that Ice -depends on but that are usually included on these systems, such as bzip2 -and OpenSSL. +depends on but that are usually included on these systems, such as +bzip2 and OpenSSL. This document provides instructions for applying patches and for configuring these third-party packages on each of the supported @@ -36,8 +36,6 @@ Table of Contents 3. Instructions for OS X - Berkeley DB - mcpp - 4. Instructions for Solaris - - mcpp ====================================================================== @@ -64,15 +62,15 @@ building mcpp. Berkeley DB ----------- -The file db/patch.db.5.3.21 in this archive contains several fixes -required to build Berkeley DB with Apple Clang 4.2. This patch is +The file db/patch.db.5.3.28 in this archive contains several fixes +required to build Berkeley DB with Apple Clang. This patch is not needed if you use another C++ compiler. After extracting the Berkeley DB source distribution, change to the top-level directory and apply the patch as shown below: - $ cd db-5.3.21.NC - $ patch -p0 < ../db/patch.db.5.3.21 + $ cd db-5.3.28.NC + $ patch -p0 < ../db/patch.db.5.3.28 Follow the platform-specific instructions below for configuring and building Berkeley DB. @@ -114,8 +112,8 @@ Berkeley DB ----------- Berkeley DB must be configured with C++ support enabled. If you -intend to use Ice for Java with Berkeley DB, you must also enable Java -support. +intend to use Ice for Java with Berkeley DB, you must also enable +Java support. $ export CXX=clang++ $ ../dist/configure --enable-cxx --enable-static=no @@ -148,45 +146,3 @@ For builds with support for both i386 and x86_64 architectures, use: $ export CFLAGS="-O3 -fno-common -arch i386 -arch x86_64" $ ./configure --enable-mcpplib --disable-shared (and --prefix=<dir> if you like) - - -====================================================================== -4. Instructions for Solaris -====================================================================== - -Berkeley DB ------------ - -Berkeley DB must be configured with C++ support enabled. If you intend -to use Ice for Java with Berkeley DB, you must also enable Java -support: - - $ ../dist/configure --enable-cxx --enable-static=no - (plus --prefix=<dir> and/or --enable-java if you like) - -For 64-bit builds, use: - - $ export CFLAGS="-m64 -O" - $ export CXXFLAGS="-m64 -O" - $ export LDFLAGS="-m64" - $ ../dist/configure --enable-cxx --enable-static=no - (plus --prefix=<dir> and/or --enable-java if you like) - - -mcpp ----- - -Ice requires the library version of mcpp, so configure mcpp as shown -below: - - $ ./configure CFLAGS=-xcode=pic32 --enable-mcpplib --disable-shared - (and --prefix=<dir> if you like) - -For 64-bit builds, use: - - $ ./configure CFLAGS="-xcode=pic32 -m64" --enable-mcpplib --disable-shared - (and --prefix=<dir> if you like) - -On 64-bit platforms, after installation it is necessary to rename the -library installation directory from $(prefix)/lib to -$(prefix)/lib/sparcv9 for SPARC or $(prefix)/lib/amd64 for x86. diff --git a/distribution/src/thirdparty/db/patch.db.5.3.21 b/distribution/src/thirdparty/db/patch.db.5.3.21 index 7398e40b94c..9d81f91ba2a 100644 --- a/distribution/src/thirdparty/db/patch.db.5.3.21 +++ b/distribution/src/thirdparty/db/patch.db.5.3.21 @@ -1,5 +1,8 @@ -diff -r -c -N ../db-5.3.21.NC-old/src/dbinc/atomic.h ./src/dbinc/atomic.h -*** ../db-5.3.21.NC-old/src/dbinc/atomic.h 2012-05-11 19:57:53.000000000 +0200 +# +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +# +diff -r -c -N ../db-5.3.28.NC-old/src/dbinc/atomic.h ./src/dbinc/atomic.h +*** ../db-5.3.28.NC-old/src/dbinc/atomic.h 2012-05-11 19:57:53.000000000 +0200 --- ./src/dbinc/atomic.h 2013-02-04 18:47:26.000000000 +0100 *************** *** 70,76 **** @@ -69,8 +72,8 @@ diff -r -c -N ../db-5.3.21.NC-old/src/dbinc/atomic.h ./src/dbinc/atomic.h #else #define atomic_inc(env, p) __atomic_inc(env, p) #define atomic_dec(env, p) __atomic_dec(env, p) -diff -r -c -N ../db-5.3.21.NC-old/src/mp/mp_fget.c ./src/mp/mp_fget.c -*** ../db-5.3.21.NC-old/src/mp/mp_fget.c 2012-05-11 19:57:53.000000000 +0200 +diff -r -c -N ../db-5.3.28.NC-old/src/mp/mp_fget.c ./src/mp/mp_fget.c +*** ../db-5.3.28.NC-old/src/mp/mp_fget.c 2012-05-11 19:57:53.000000000 +0200 --- ./src/mp/mp_fget.c 2013-02-04 18:48:28.000000000 +0100 *************** *** 649,655 **** @@ -106,8 +109,8 @@ diff -r -c -N ../db-5.3.21.NC-old/src/mp/mp_fget.c ./src/mp/mp_fget.c MUTEX_LOCK(env, alloc_bhp->mtx_buf); alloc_bhp->priority = bhp->priority; alloc_bhp->pgno = bhp->pgno; -diff -r -c -N ../db-5.3.21.NC-old/src/mp/mp_mvcc.c ./src/mp/mp_mvcc.c -*** ../db-5.3.21.NC-old/src/mp/mp_mvcc.c 2012-05-11 19:57:53.000000000 +0200 +diff -r -c -N ../db-5.3.28.NC-old/src/mp/mp_mvcc.c ./src/mp/mp_mvcc.c +*** ../db-5.3.28.NC-old/src/mp/mp_mvcc.c 2012-05-11 19:57:53.000000000 +0200 --- ./src/mp/mp_mvcc.c 2013-02-04 18:48:28.000000000 +0100 *************** *** 276,282 **** @@ -143,8 +146,8 @@ diff -r -c -N ../db-5.3.21.NC-old/src/mp/mp_mvcc.c ./src/mp/mp_mvcc.c F_CLR(alloc_bhp, BH_FROZEN); } -diff -r -c -N ../db-5.3.21.NC-old/src/mp/mp_region.c ./src/mp/mp_region.c -*** ../db-5.3.21.NC-old/src/mp/mp_region.c 2012-05-11 19:57:53.000000000 +0200 +diff -r -c -N ../db-5.3.28.NC-old/src/mp/mp_region.c ./src/mp/mp_region.c +*** ../db-5.3.28.NC-old/src/mp/mp_region.c 2012-05-11 19:57:53.000000000 +0200 --- ./src/mp/mp_region.c 2013-02-04 18:48:28.000000000 +0100 *************** *** 245,251 **** @@ -180,8 +183,8 @@ diff -r -c -N ../db-5.3.21.NC-old/src/mp/mp_region.c ./src/mp/mp_region.c #ifdef HAVE_STATISTICS hp->hash_io_wait = 0; hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; -diff -r -c -N ../db-5.3.21.NC-old/src/mutex/mut_method.c ./src/mutex/mut_method.c -*** ../db-5.3.21.NC-old/src/mutex/mut_method.c 2012-05-11 19:57:53.000000000 +0200 +diff -r -c -N ../db-5.3.28.NC-old/src/mutex/mut_method.c ./src/mutex/mut_method.c +*** ../db-5.3.28.NC-old/src/mutex/mut_method.c 2012-05-11 19:57:53.000000000 +0200 --- ./src/mutex/mut_method.c 2013-02-04 18:48:28.000000000 +0100 *************** *** 474,480 **** @@ -200,8 +203,8 @@ diff -r -c -N ../db-5.3.21.NC-old/src/mutex/mut_method.c ./src/mutex/mut_method. MUTEX_UNLOCK(env, mtx); return (ret); -diff -r -c -N ../db-5.3.21.NC-old/src/mutex/mut_tas.c ./src/mutex/mut_tas.c -*** ../db-5.3.21.NC-old/src/mutex/mut_tas.c 2012-05-11 19:57:54.000000000 +0200 +diff -r -c -N ../db-5.3.28.NC-old/src/mutex/mut_tas.c ./src/mutex/mut_tas.c +*** ../db-5.3.28.NC-old/src/mutex/mut_tas.c 2012-05-11 19:57:54.000000000 +0200 --- ./src/mutex/mut_tas.c 2013-02-04 18:48:28.000000000 +0100 *************** *** 47,53 **** |