Author: hdu
Date: Mon Jan 6 14:11:28 2014
New Revision: 1555790
URL: http://svn.apache.org/r1555790
Log:
#i123817# update boost library to version 1.55
Modified:
openoffice/trunk/main/boost/makefile.mk
openoffice/trunk/main/boost/prj/d.lst
openoffice/trunk/main/external_deps.lst
Modified: openoffice/trunk/main/boost/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/boost/makefile.mk?rev=1555790&r1=1555789&r2=1555790&view=diff
==============================================================================
--- openoffice/trunk/main/boost/makefile.mk (original)
+++ openoffice/trunk/main/boost/makefile.mk Mon Jan 6 14:11:28 2014
@@ -34,24 +34,18 @@ TARGET=ooo_boost
.INCLUDE : settings.mk
-# force patched boost for sunpro CC
-# to workaround opt bug when compiling with -xO3
-.IF "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
+.IF "$(SYSTEM_BOOST)" == "YES"
+
all:
@echo "An already available installation of boost should exist on your
system."
@echo "Therefore the version provided here does not need to be built in
addition."
-.ELSE # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" ||
"$(COM)"=="GCC")
+
+.ELSE # "$(SYSTEM_BOOST)" == "YES"
# --- Files --------------------------------------------------------
-TARFILE_NAME=boost_1_48_0
-TARFILE_MD5=d1e9a7a7f532bb031a3c175d86688d95
-PATCH_FILES=\
- $(TARFILE_NAME).patch \
- boost_freebsd.patch
-.IF "$(GUI)"=="OS2"
-PATCH_FILES+=boost-os2.patch
-.ENDIF
+TARFILE_NAME=boost_1_55_0
+TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354
CONFIGURE_DIR=
CONFIGURE_ACTION=
@@ -93,6 +87,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/container
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset
$(INCCOM)$/$(PRJNAME)
@@ -128,6 +123,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/parameter
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/predef
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/phoenix
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/polygon
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool
$(INCCOM)$/$(PRJNAME)
@@ -167,4 +163,6 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
-.ENDIF # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" ||
"$(COM)"=="GCC")
+
+.ENDIF # "$(SYSTEM_BOOST)" == "YES"
+
Modified: openoffice/trunk/main/boost/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/boost/prj/d.lst?rev=1555790&r1=1555789&r2=1555790&view=diff
==============================================================================
--- openoffice/trunk/main/boost/prj/d.lst (original)
+++ openoffice/trunk/main/boost/prj/d.lst Mon Jan 6 14:11:28 2014
@@ -314,6 +314,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\math\spec
mkdir: %_DEST%\inc%_EXT%\boost\math\tools
mkdir: %_DEST%\inc%_EXT%\boost\math\tools\detail
mkdir: %_DEST%\inc%_EXT%\boost\move
+mkdir: %_DEST%\inc%_EXT%\boost\move\detail
mkdir: %_DEST%\inc%_EXT%\boost\mpi
mkdir: %_DEST%\inc%_EXT%\boost\mpi\collectives
mkdir: %_DEST%\inc%_EXT%\boost\mpi\detail
@@ -430,6 +431,15 @@ mkdir: %_DEST%\inc%_EXT%\boost\polygon
mkdir: %_DEST%\inc%_EXT%\boost\polygon\detail
mkdir: %_DEST%\inc%_EXT%\boost\pool
mkdir: %_DEST%\inc%_EXT%\boost\pool\detail
+mkdir: %_DEST%\inc%_EXT%\boost\predef
+mkdir: %_DEST%\inc%_EXT%\boost\predef\architecture
+mkdir: %_DEST%\inc%_EXT%\boost\predef\architecture\x86
+mkdir: %_DEST%\inc%_EXT%\boost\predef\detail
+mkdir: %_DEST%\inc%_EXT%\boost\predef\library
+mkdir: %_DEST%\inc%_EXT%\boost\predef\library\c
+mkdir: %_DEST%\inc%_EXT%\boost\predef\os
+mkdir: %_DEST%\inc%_EXT%\boost\predef\os\bsd
+mkdir: %_DEST%\inc%_EXT%\boost\predef\other
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
@@ -466,6 +476,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\preproces
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
+mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\variadic
mkdir: %_DEST%\inc%_EXT%\boost\program_options
mkdir: %_DEST%\inc%_EXT%\boost\program_options\detail
mkdir: %_DEST%\inc%_EXT%\boost\property_map
@@ -1038,6 +1049,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive
..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools
..\%__SRC%\inc\boost\math\tools\detail\*
%_DEST%\inc%_EXT%\boost\math\tools\detail
..\%__SRC%\inc\boost\move\* %_DEST%\inc%_EXT%\boost\move
+..\%__SRC%\inc\boost\move\detail\* %_DEST%\inc%_EXT%\boost\move\detail
..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi
..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives
..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail
@@ -1149,6 +1161,15 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive
..\%__SRC%\inc\boost\polygon\detail\* %_DEST%\inc%_EXT%\boost\polygon\detail
..\%__SRC%\inc\boost\pool\* %_DEST%\inc%_EXT%\boost\pool
..\%__SRC%\inc\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail
+..\%__SRC%\inc\boost\predef\* %_DEST%\inc%_EXT%\boost\predef
+..\%__SRC%\inc\boost\predef\architecture\*
%_DEST%\inc%_EXT%\boost\predef\architecture
+..\%__SRC%\inc\boost\predef\architecture\x86\*
%_DEST%\inc%_EXT%\boost\predef\architecture\x86
+..\%__SRC%\inc\boost\predef\detail\* %_DEST%\inc%_EXT%\boost\predef\detail
+..\%__SRC%\inc\boost\predef\library\* %_DEST%\inc%_EXT%\boost\predef\library
+..\%__SRC%\inc\boost\predef\library\c\*
%_DEST%\inc%_EXT%\boost\predef\library\c
+..\%__SRC%\inc\boost\predef\os\* %_DEST%\inc%_EXT%\boost\predef\os
+..\%__SRC%\inc\boost\predef\os\bsd\* %_DEST%\inc%_EXT%\boost\predef\os\bsd
+..\%__SRC%\inc\boost\predef\other\* %_DEST%\inc%_EXT%\boost\predef\other
..\%__SRC%\inc\boost\preprocessor\arithmetic\*
%_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
..\%__SRC%\inc\boost\preprocessor\arithmetic\detail\*
%_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
..\%__SRC%\inc\boost\preprocessor\array\*
%_DEST%\inc%_EXT%\boost\preprocessor\array
@@ -1185,6 +1206,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive
..\%__SRC%\inc\boost\preprocessor\slot\*
%_DEST%\inc%_EXT%\boost\preprocessor\slot
..\%__SRC%\inc\boost\preprocessor\slot\detail\*
%_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
..\%__SRC%\inc\boost\preprocessor\tuple\*
%_DEST%\inc%_EXT%\boost\preprocessor\tuple
+..\%__SRC%\inc\boost\preprocessor\variadic\*
%_DEST%\inc%_EXT%\boost\preprocessor\variadic
..\%__SRC%\inc\boost\program_options\* %_DEST%\inc%_EXT%\boost\program_options
..\%__SRC%\inc\boost\program_options\detail\*
%_DEST%\inc%_EXT%\boost\program_options\detail
..\%__SRC%\inc\boost\property_map\* %_DEST%\inc%_EXT%\boost\property_map
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1555790&r1=1555789&r2=1555790&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Mon Jan 6 14:11:28 2014
@@ -204,10 +204,10 @@ if (SYSTEM_PYTHON != YES)
URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
- MD5 = d1e9a7a7f532bb031a3c175d86688d95
- name = boost_1_48_0.tar.bz2
- URL1 =
http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download
+if (SYSTEM_BOOST != YES)
+ MD5 = d6eef4b4cacb2183f2bf265a5a03a354
+ name = boost_1_55_0.tar.bz2
+ URL1 =
http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_VIGRA != YES)
