boost: convert to gbuild

Change-Id: If3840e048edc93adec3df7fa818e8b43d17cb1d5

Makefile.top

@@ -43,6 +43,7 @@ basegfx\
 basic\
 bean\
 binaryurp\
+boost\
 canvas\
 chart2\
 clucene\
@@ -177,7 +178,6 @@ apache-commons\
 beanshell\
 berkeleydb\
 binfilter \
-boost\
 bridges\
 cairo\
 cli_ure\

RepositoryModule_ooo.mk

@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     bean \
     binaryurp \
     bluez_bluetooth \
+	boost \
     canvas \
     chart2 \
     clucene \

boost/Makefile

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:

boost/Module_boost.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,boost))
+
+ifeq ($(SYSTEM_BOOST),NO)
+
+$(eval $(call gb_Module_add_targets,boost,\
+	StaticLibrary_boostdatetime \
+	UnpackedTarball_boost \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:

boost/StaticLibrary_boostdatetime.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,boostdatetime))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostdatetime))
+	
+$(eval $(call gb_StaticLibrary_use_unpacked,boostdatetime,boost))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,boostdatetime,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,boostdatetime,\
+	UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \
+	UnpackedTarball/boost/libs/date_time/src/gregorian/gregorian_types \
+	UnpackedTarball/boost/libs/date_time/src/gregorian/greg_month \
+	UnpackedTarball/boost/libs/date_time/src/gregorian/greg_weekday \
+))
+
+# vim: set noet sw=4 ts=4:

boost/UnpackedTarball_boost.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+boost_patches :=
+#https://svn.boost.org/trac/boost/ticket/3780
+boost_patches += boost.3780.aliasing.patch
+#https://svn.boost.org/trac/boost/ticket/4127
+boost_patches += boost.4127.warnings.patch
+#https://svn.boost.org/trac/boost/ticket/4713
+boost_patches += boost.4713.warnings.patch
+#https://svn.boost.org/trac/boost/ticket/5119
+boost_patches += boost.5119.unordered_map-cp-ctor.patch
+#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679
+boost_patches += boost.gcc47679.patch
+#https://svn.boost.org/trac/boost/ticket/6369
+boost_patches += boost.6369.warnings.patch
+#https://svn.boost.org/trac/boost/ticket/6397
+boost_patches += boost.6397.warnings.patch
+#backport from boost 1.48.0 fix for "opcode not supported on this processor"
+boost_patches += boost.mipsbackport.patch
+
+boost_patches += boost.windows.patch
+boost_patches += boost.vc2012.patch
+
+# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
+ifeq (GCC,$(COM))
+boost_patches += boost_1_44_0-unused-parameters.patch
+boost_patches += boost_1_44_0-logical-op-parentheses.patch
+endif
+
+# Backporting fixes for the GCC 4.7 -std=c++11 mode from Boost 1.48.0:
+boost_patches += boost_1_44_0-gcc4.7.patch
+
+# Clang warnings:
+boost_patches += boost_1_44_0-clang-warnings.patch
+
+# Backport http://svn.boost.org/svn/boost/trunk r76133 "Fix threading detection
+# in GCC-4.7 experimental":
+boost_patches += boost_1_44_0-gthreads.patch
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,boost,\
+	$(foreach patch,$(boost_patches),boost/$(patch)) \
+))
+
+$(eval $(call gb_UnpackedTarball_copy_header_files,boost,\
+	boost \
+))
+
+# vim: set noet sw=4 ts=4:

boost/boost_1_44_0.patch

---- misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk
-+++ misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk
-@@ -1,1 +1,22 @@
--dummy
-+PRJ=..$/..$/..$/..$/..$/..$/..$/..
-+
-+PRJNAME=boostthread
-+TARGET=boostthread
-+ENABLE_EXCEPTIONS=TRUE
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+.IF "$(GUI)"=="WNT"
-+
-+.INCLUDE :  settings.mk
-+
-+SLOFILES=	$(SLO)$/thread.obj \
-+			$(SLO)$/tss_dll.obj \
-+			$(SLO)$/tss_pe.obj
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+.INCLUDE :  target.mk
-+.ENDIF
---- misc/boost_1_44_0/libs/date_time/src/gregorian/makefile.mk	2011-10-05 16:28:29.191616897 +0200
-+++ misc/build/boost_1_44_0/libs/date_time/src/gregorian/makefile.mk	2011-10-05 16:27:40.511187732 +0200
-@@ -1,1 +1,21 @@
--dummy
-+PRJ=..$/..$/..$/..$/..$/..$/..$/..
-+
-+PRJNAME=boostdatetime
-+TARGET=boostdatetime
-+ENABLE_EXCEPTIONS=TRUE
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+.INCLUDE :  settings.mk
-+
-+SLOFILES= \
-+	$(SLO)$/gregorian_types.obj \
-+	$(SLO)$/greg_weekday.obj \
-+	$(SLO)$/date_generators.obj \
-+	$(SLO)$/greg_month.obj \
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+.INCLUDE :  target.mk

config_host.mk.in

@@ -28,6 +28,7 @@ export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
 export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
 export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
 export BOOST_LDFLAGS=@BOOST_LDFLAGS@
+export BOOST_TARBALL=@BOOST_TARBALL@
 export BSH_JAR=@BSH_JAR@
 export BUILD_DMAKE=@BUILD_DMAKE@
 export BUILD_EPM=@BUILD_EPM@

configure.in

@@ -7724,11 +7724,13 @@ else
     AC_MSG_RESULT([internal])
     BUILD_TYPE="$BUILD_TYPE BOOST"
     SYSTEM_BOOST=NO
+    BOOST_TARBALL=f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
     HAVE_BOOST_UNORDERED_MAP=TRUE
 fi
 AC_SUBST([HAVE_BOOST_UNORDERED_MAP])
 AC_SUBST([MINGW_BOOST_DATE_TIME_DLL])
 AC_SUBST(SYSTEM_BOOST)
+AC_SUBST(BOOST_TARBALL)
 
 dnl ===================================================================
 dnl Check for system mdds

ooo.lst.in

@@ -85,7 +85,7 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
 d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
 3e89a35f253a4f1c7de68c57d851ef38-mdds_0.6.0.tar.bz2
-f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+@BOOST_TARBALL@
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
 94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2

solenv/inc/libs.mk

@@ -531,7 +531,6 @@ SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib
 UNOTESTLIB=iunotest.lib
-BOOSTTHREADLIB=boostthread.lib
 XMLREADERLIB=ixmlreader.lib
 
 .ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC")