[lmi-commits] [lmi] master 433a2aa 3/7: Neither install boost nor support its use

[Greg Chicares]

branch: master
commit 433a2aa29c6588a3c004aa9d9ae6ba86ceccb4a3
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Neither install boost nor support its use
    
    Some unit tests may use boost as a non-default, unsupported option
    that is principally of historical interest, but workarounds for boost
    defects have been eradicated.
---
 install_miscellanea.make | 21 ++++-----------------
 workhorse.make           | 27 ---------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/install_miscellanea.make b/install_miscellanea.make
index 30455a2..aabe38a 100644
--- a/install_miscellanea.make
+++ b/install_miscellanea.make
@@ -43,32 +43,28 @@ third_party_source_dir  := $(dest_dir)/src
 
 # File lists 
###################################################################
 
-boost_archive    := boost_1_33_1.tar.bz2
 cgicc_archive    := cgicc-3.1.4.tar.bz2
 jing_archive     := jing-20091111.zip
 sample_archive   := lmi-data-20050618T1440Z.tar.bz2
 trang_archive    := trang-20091111.zip
 
 file_list := \
-  $(boost_archive) \
   $(cgicc_archive) \
   $(jing_archive) \
   $(sample_archive) \
   $(trang_archive) \
 
-boost cgicc:          stem = $(basename $(basename $($@_archive)))
-jing trang:           stem =            $(basename $($@_archive))
-sample:               stem = data
+cgicc:      stem = $(basename $(basename $($@_archive)))
+jing trang: stem =            $(basename $($@_archive))
+sample:     stem = data
 
 # URLs and archive md5sums 
#####################################################
 
-$(boost_archive)-url    := $(sf_mirror)/boost/$(boost_archive)
 $(cgicc_archive)-url    := ftp://ftp.gnu.org/pub/gnu/cgicc/$(cgicc_archive)
 $(jing_archive)-url     := 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jing-trang/$(jing_archive)
 $(sample_archive)-url   := 
https://download.savannah.gnu.org/releases/lmi/$(sample_archive)
 $(trang_archive)-url    := 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jing-trang/$(trang_archive)
 
-$(boost_archive)-md5    := 2b999b2fb7798e1737d1fff8fac602ef
 $(cgicc_archive)-md5    := 6cb5153fc9fa64b4e50c7962aa557bbe
 $(jing_archive)-md5     := 13eef193921409a1636377d1efbf9843
 $(sample_archive)-md5   := e7f07133abfc3b9c2252dfa3b61191bc
@@ -111,7 +107,7 @@ ad_hoc_dir_exists = \
 # Targets 
######################################################################
 
 .PHONY: all
-all: boost cgicc jing sample trang
+all: cgicc jing sample trang
 
 # Patches were generated according to this advice:
 #
@@ -152,15 +148,6 @@ all: boost cgicc jing sample trang
 # in case a library is updated. The second step is not removed because
 # it is idiomatic, and its absence would be remarkable.
 
-.PHONY: boost
-boost: $(file_list)
-       -[ -e $(stem).patch ] && $(PATCH) --directory=$(ad_hoc_dir) --strip=1 < 
$(stem).patch
-       $(CHMOD) -R g=u $(ad_hoc_dir)/$(stem)
-       $(MKDIR) $(third_party_include_dir)/boost/
-       $(CP) --force --preserve --recursive $(ad_hoc_dir)/$(stem)/boost/* 
$(third_party_include_dir)/boost/
-       $(MKDIR) $(third_party_source_dir)/boost/
-       $(MV)                                $(ad_hoc_dir)/$(stem)/*       
$(third_party_source_dir)/boost/
-
 .PHONY: cgicc
 cgicc: $(file_list)
        $(PATCH) --directory=$(ad_hoc_dir) --strip=1 < $(stem).patch
diff --git a/workhorse.make b/workhorse.make
index 1ed0d8f..f28895b 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -321,8 +321,6 @@ wx_config_check:
 # be compiled and linked explicitly here, instead of building them
 # separately and linking them as normal libraries. Rationale:
 #
-# boost: the build system provided is outlandish.
-#
 # cgicc: './configure && make' failed in the MSYS environment (though
 # MSYS is no longer supported).
 #
@@ -350,7 +348,6 @@ sys_include_directories := \
 
 all_source_directories := \
   $(srcdir) \
-  /opt/lmi/third_party/src/boost/libs/filesystem/src \
   /opt/lmi/third_party/src/cgicc \
 
 vpath lib%.a          $(CURDIR)
@@ -619,17 +616,6 @@ ifeq (safestdlib,$(findstring safestdlib,$(build_type)))
   endif
 endif
 
-# Boost normally makes '-Wundef' give spurious warnings:
-#   http://aspn.activestate.com/ASPN/Mail/Message/boost/1822550
-# but defining BOOST_STRICT_CONFIG:
-#   http://www.boost.org/libs/config/config.htm#user_settable
-# makes '-Wundef' usable, because boost-1.31.0 doesn't seem to need
-# any workarounds for gcc-3.3+ . However, it gives a number of
-# warnings with wx-2.5.4 (that have been fixed in a later version).
-
-# Too many warnings for wx and various boost libraries:
-#  -Wold-style-cast \
-
 # XMLWRAPP !! Remove these workarounds after updating xmlwrapp. See:
 #   https://lists.nongnu.org/archive/html/lmi/2019-03/msg00018.html
 # et seqq.:
@@ -808,14 +794,6 @@ endif
 # repeated below to make assurance doubly sure--see:
 #   https://lists.nongnu.org/archive/html/lmi/2019-03/msg00039.html
 # et seq.
-#
-# The BOOST_STATIC_ASSERT definition seems to belong in CPPFLAGS with
-# the other macro definitions. However, writing it there elicits:
-#   warning: ISO C99 requires whitespace after the macro name
-# which may simply be a gnu CPP defect--the documentation:
-#   https://gcc.gnu.org/onlinedocs/gcc/Preprocessor-Options.html
-# says "-D'name(args...)=definition' works", and adding a blank either
-# before or after '=' is an error.
 
 REQUIRED_CPPFLAGS = \
   $(addprefix -I , $(lmi_include_directories)) \
@@ -826,17 +804,12 @@ REQUIRED_CPPFLAGS = \
   $(libstdcxx_warning_macros) \
   $(wx_predefinitions) \
   -D_FILE_OFFSET_BITS=64 \
-  -DBOOST_NO_AUTO_PTR \
-  -DBOOST_NO_STD_ALLOCATOR \
-  -DBOOST_STRICT_CONFIG \
-  -DBOOST_STATIC_ASSERT_HPP \
 
 REQUIRED_CFLAGS = \
   $(C_WARNINGS) \
 
 REQUIRED_CXXFLAGS = \
   $(CXX_WARNINGS) \
-  -D'BOOST_STATIC_ASSERT(A)=static_assert((A))' \
 
 REQUIRED_ARFLAGS = \
   -rus