Re: UPDATE: Boost 1.72

On Wed, Jan 20, 2021 at 04:06:20PM -0500, Brad Smith wrote:
> Here is an update to Boost 1.72.
>
> Took a bit more digging. After a bit of adjustments and with debugging
> messages turned on in one step, hinting that user-config.jam was being created
> in the wrong spot, I was able to get the build to use the proper compiler in
> the various configure and build steps.
>
> Looking for any further feedback / Oks at this point.

An updated diff rolling in a sort of errata patch which seems to resolve a
build issue with Icinga. With that down the tree appears to be good in
good shape on amd64.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/boost/Makefile,v
retrieving revision 1.106
diff -u -p -u -p -r1.106 Makefile
--- Makefile 21 Dec 2020 19:07:52 -0000 1.106
+++ Makefile 20 Jan 2021 20:59:30 -0000
@@ -5,8 +5,7 @@ ONLY_FOR_ARCHS-md = aarch64 amd64 arm i3
COMMENT-main= free peer-reviewed portable C++ source libraries
COMMENT-md= machine-dependent libraries for boost

-VERSION= 1.70.0
-REVISION= 2
+VERSION= 1.72.0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME-main= boost-${VERSION}
PKGNAME-md= boost-md-${VERSION}
@@ -15,7 +14,7 @@ MASTER_SITES= https://dl.bintray.com/boo
EXTRACT_SUFX= .tar.bz2
FIX_EXTRACT_PERMISSIONS = Yes

-SO_VERSION= 12.0
+SO_VERSION= 13.0
BOOST_LIBS= boost_atomic-mt \
boost_chrono-mt boost_chrono \
boost_container-mt boost_container \
@@ -71,7 +70,7 @@ MAINTAINER= Brad Smith <brad@comstyle.co
# Boost
PERMIT_PACKAGE= Yes

-WANTLIB += ${COMPILER_LIBCXX} bz2 c icudata icui18n icuuc m z
+WANTLIB += ${COMPILER_LIBCXX} bz2 icudata icui18n icuuc m z

COMPILER= base-clang ports-gcc

@@ -99,8 +98,6 @@ TOOLSET= clang
TOOLSET= gcc
.endif

-MAKE_ENV= GCC="${CC}" GXX="${CXX}"
-
BJAM_CONFIG= -sICU_PATH=${LOCALBASE} \
-sBZIP2_INCLUDE=${LOCALBASE}/include \
-sBZIP2_LIBPATH=${LOCALBASE}/lib \
@@ -113,7 +110,8 @@ BJAM_CONFIG= -sICU_PATH=${LOCALBASE} \
cxxflags='${CXXFLAGS} -pthread' \
variant=release \
link=static,shared \
- threading=single,multi
+ threading=single,multi \
+ toolset=${TOOLSET}

BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
--with-toolset=${TOOLSET} \
@@ -139,22 +137,20 @@ NO_TEST= Yes
SUBST_VARS+= SO_VERSION

do-configure:
- echo "using ${TOOLSET} : : ${CXX} ;" >>${WRKSRC}/tools/build/user-config.jam
+ echo "using ${TOOLSET} : : ${CXX} ;" >>${WRKSRC}/tools/build/src/user-config.jam
${SUBST_CMD} ${WRKSRC}/Jamroot
- cd ${WRKSRC}/libs/config && \
+ @cd ${WRKSRC}/libs/config && \
${SETENV} ${CONFIGURE_ENV} /bin/sh ./configure
- cd ${WRKSRC}/tools/build/src/engine && \
- ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" /bin/sh ./build.sh cc && \
- cp bin.openbsd*/b2 bin.openbsd*/bjam ${WRKSRC}
- cd ${WRKSRC} && ${SETENV} /bin/sh ./bootstrap.sh ${BOOTSTRAP}
+ @cd ${WRKSRC}/tools/build/src/engine && ${SETENV} ${CONFIGURE_ENV} \
+ /bin/sh ./build.sh ${TOOLSET} && cp b2 bjam ${WRKSRC}
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} /bin/sh ./bootstrap.sh ${BOOTSTRAP}

do-build:
- cd ${WRKSRC} && export ${MAKE_ENV} && \
- ./b2 ${BJAM_CONFIG}
+ @cd ${WRKSRC} && export ${MAKE_ENV} && ./b2 ${BJAM_CONFIG}

do-install:
- ${INSTALL_DATA} ${WRKSRC}/stage/lib/* ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/include/boost
+ ${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
cd ${WRKSRC}/boost && \
pax -rw -s ':^.*\.orig$$::' . ${PREFIX}/include/boost
find ${PREFIX}/include/boost -type d -exec chmod ${DIRMODE} {} +
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/boost/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 5 Nov 2020 11:23:03 -0000 1.12
+++ distinfo 15 Dec 2020 02:02:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (boost_1_70_0.tar.bz2) = QwroNUeJ3k/RnuUvOx9znh+6V28K3tCJfDwrwA+zh3g=
-SIZE (boost_1_70_0.tar.bz2) = 97887058
+SHA256 (boost_1_72_0.tar.bz2) = WcmydLxFHPkam6HdLH/cr11gsbOqg/LJ+hQ0F8xmByI=
+SIZE (boost_1_72_0.tar.bz2) = 106907358
Index: patches/patch-Jamroot
===================================================================
RCS file: /home/cvs/ports/devel/boost/patches/patch-Jamroot,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-Jamroot
--- patches/patch-Jamroot 5 Nov 2020 11:23:03 -0000 1.8
+++ patches/patch-Jamroot 15 Dec 2020 02:09:52 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-Jamroot,v 1.8 2020/11/05
Index: Jamroot
--- Jamroot.orig
+++ Jamroot
-@@ -145,8 +145,9 @@ import tools/boost_install/boost-install ;
+@@ -146,8 +146,9 @@ import tools/boost\_install/boost-install ;
path-constant BOOST_ROOT : . ;
- constant BOOST_VERSION : 1.70.0 ;
+ constant BOOST_VERSION : 1.72.0 ;
constant BOOST_JAMROOT_MODULE : $(__name__) ;
+constant SO_VERSION : ${SO_VERSION} ;

Index: patches/patch-boost_asio_detail_config_hpp
===================================================================
RCS file: patches/patch-boost_asio_detail_config_hpp
diff -N patches/patch-boost_asio_detail_config_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-boost_asio_detail_config_hpp 5 Jan 2021 13:15:27 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Use _POSIX_VERSION to detect support for MSG_NOSIGNAL.
+
+Index: boost/asio/detail/config.hpp
+--- boost/asio/detail/config.hpp.orig
++++ boost/asio/detail/config.hpp
+@@ -1475,4 +1475,15 @@
+ # endif // defined(__clang__)
+