Re: boost futex diff

On Sat, Dec 23, 2023 at 08:44:28PM -0500, Brad Smith wrote:
> On 2023-12-23 4:47 a.m., Theo Buehler wrote:
> > This is based on a diff from Brad who noticed that the diff disabling
> > syscall(2) accidentally disabled futexes altogether. This diff reverts
> > to the state prior to that commit by taking the intended approach:
> > replace syscall(SYS_futex, ...) with a call to futex(2) itself.
> >
> > The second part of the diff enables futexes for fiber.
> >
> > I think this is an improvement over the current state. It went through a
> > bulk without fallout. Unless I hear objections, I plan on committing
> > this in a few days.
>
> A piece of the diff is missing. The fiber/detail/config.hpp part. Without
> that the
> other piece is not built.

Ah yes, forgotten cvs add. I'll commit this, then, including the
PATCHORIG bit pointed out by gkoehler.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/boost/Makefile,v
diff -u -p -r1.140 Makefile
--- Makefile 24 Dec 2023 00:26:12 -0000 1.140
+++ Makefile 24 Dec 2023 04:57:15 -0000
@@ -11,8 +11,8 @@ COMMENT-md= machine-dependent libraries
VERSION= 1.84.0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME= boost-${VERSION}
-REVISION= 0
-EPOCH = 0
+REVISION= 1
+EPOCH= 0
CATEGORIES= devel
SITES= https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
EXTRACT_SUFX= .tar.bz2
@@ -151,7 +151,7 @@ do-install:
${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
+ pax -rw -s ':^.*${PATCHORIG}$$::' . ${PREFIX}/include/boost
find ${PREFIX}/include/boost -type d -exec chmod ${DIRMODE} {} +
find ${PREFIX}/include/boost -type f -exec chmod ${SHAREMODE} {} +
# boost-build:
@@ -159,11 +159,11 @@ do-install:
${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/b2
@cd ${WRKSRC}/tools/build/src && \
- pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*\.orig$$::' . \
+ pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*${PATCHORIG}$$::' . \
${PREFIX}/share/b2
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/b2
@cd ${WRKSRC}/tools/build/example && \
- pax -r -w -p pm -s ':^.*\.orig$$::' . \
+ pax -r -w -p pm -s ':^.*${PATCHORIG}$$::' . \
${PREFIX}/share/examples/b2

.include <bsd.port.mk>
Index: patches/patch-boost_atomic_detail_futex_hpp
===================================================================
RCS file: /cvs/ports/devel/boost/patches/patch-boost_atomic_detail_futex_hpp,v
diff -u -p -r1.1 patch-boost_atomic_detail_futex_hpp
--- patches/patch-boost_atomic_detail_futex_hpp 28 Oct 2023 14:03:31 -0000 1.1
+++ patches/patch-boost_atomic_detail_futex_hpp 21 Dec 2023 13:01:02 -0000
@@ -1,44 +1,44 @@
Index: boost/atomic/detail/futex.hpp
--- boost/atomic/detail/futex.hpp.orig
+++ boost/atomic/detail/futex.hpp
-@@ -23,7 +23,7 @@
- #pragma once
-