From ce37e6b98718057ff4e980e7122f47c3cb8c43c2 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 5 Oct 2011 17:09:48 +0200 Subject: Build a small static date_time/gregorian for cbosdonnat's perusal --- boost/boost.4713.warnings.patch | 57 +++++++++++++++++++++++++++++++++++++++++ boost/boost_1_44_0.patch | 24 +++++++++++++++++ boost/makefile.mk | 10 +++++--- 3 files changed, 88 insertions(+), 3 deletions(-) (limited to 'boost') diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index df769476024b..6564c9b4097c 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -1,3 +1,22 @@ +--- misc/boost_1_44_0/boost/date_time/date_names_put.hpp 2008-02-27 21:00:24.000000000 +0100 ++++ misc/build/boost_1_44_0/boost/date_time/date_names_put.hpp 2011-10-05 16:58:58.413575307 +0200 +@@ -218,14 +218,14 @@ + const charT* const weekday_long_names[], + charT separator_char = '-', + ymd_order_spec order_spec = ymd_order_iso, +- month_format_spec month_format = month_as_short_string) : ++ month_format_spec month_format_ = month_as_short_string) : + month_short_names_(month_short_names), + month_long_names_(month_long_names), + special_value_names_(special_value_names), + weekday_short_names_(weekday_short_names), + weekday_long_names_(weekday_long_names), + order_spec_(order_spec), +- month_format_spec_(month_format) ++ month_format_spec_(month_format_) + { + separator_char_[0] = separator_char; + separator_char_[1] = '\0'; --- misc/boost_1_44_0/boost/ptr_container/detail/map_iterator.hpp 2008-06-24 22:37:35.000000000 +0200 +++ misc/build/boost_1_44_0/boost/ptr_container/detail/map_iterator.hpp 2011-02-04 16:39:19.000000000 +0100 @@ -49,7 +49,7 @@ @@ -900,3 +919,41 @@ ~object_pool(); +--- misc/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp 2008-11-23 12:13:35.000000000 +0100 ++++ misc/build/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp 2011-10-05 16:56:34.627320523 +0200 +@@ -108,7 +108,7 @@ + */ + BOOST_DATE_TIME_DECL + boost::date_time::all_date_names_put* +- create_facet_def(char type) ++ create_facet_def(char /* type */) + { + typedef + boost::date_time::all_date_names_put facet_def; +@@ -121,7 +121,7 @@ + } + + //! generates a locale with the set of gregorian name-strings of type char* +- BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, char type){ ++ BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, char /* type */){ + typedef boost::date_time::all_date_names_put facet_def; + return std::locale(loc, new facet_def(short_month_names, + long_month_names, +@@ -139,7 +139,7 @@ + */ + BOOST_DATE_TIME_DECL + boost::date_time::all_date_names_put* +- create_facet_def(wchar_t type) ++ create_facet_def(wchar_t /* type */) + { + typedef + boost::date_time::all_date_names_put facet_def; +@@ -152,7 +152,7 @@ + } + + //! generates a locale with the set of gregorian name-strings of type wchar_t* +- BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, wchar_t type){ ++ BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, wchar_t /* type */){ + typedef boost::date_time::all_date_names_put facet_def; + return std::locale(loc, new facet_def(w_short_month_names, + w_long_month_names, diff --git a/boost/boost_1_44_0.patch b/boost/boost_1_44_0.patch index 4673919450a8..a2e538037c30 100644 --- a/boost/boost_1_44_0.patch +++ b/boost/boost_1_44_0.patch @@ -23,3 +23,27 @@ + +.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,20 @@ +-dummy ++PRJ=..$/..$/..$/..$/..$/..$/..$/.. ++ ++PRJNAME=boostdatetime ++TARGET=boostdatetime ++ENABLE_EXCEPTIONS=TRUE ++LIBTARGET=NO ++ ++.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 diff --git a/boost/makefile.mk b/boost/makefile.mk index b9feb7b9540a..3ba21d8c66c8 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -63,7 +63,8 @@ PATCH_FILES+=boost.gcc47679.patch PATCH_FILES+=boost.windows.patch ADDITIONAL_FILES= \ - libs/thread/src/win32/makefile.mk + libs/thread/src/win32/makefile.mk \ + libs/date_time/src/gregorian/makefile.mk CONFIGURE_DIR= CONFIGURE_ACTION= @@ -129,15 +130,18 @@ normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) .IF "$(GUI)"!="WNT" -$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize +$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize boostdatetimelib .ELSE -$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : boostthreadlib +$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : boostthreadlib boostdatetimelib boostthreadlib : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) cd $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/libs/thread/src/win32 && dmake $(MFLAGS) $(CALLMACROS) .ENDIF +boostdatetimelib : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) + cd $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/libs/date_time/src/gregorian && dmake $(MFLAGS) $(CALLMACROS) + .ENDIF # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC") -- cgit