From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: PING: UPDATE: devel/robin-map
To: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
Cc: ports@openbsd.org
Date: Tue, 20 Feb 2024 13:34:57 +0000

On 2024/02/20 14:06, Sebastian Reitenbach wrote:
> On Saturday, February 17, 2024 19:23 CET, "Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de> wrote:
> 
> > Hi,
> > 
> > found the version we have in-tree is quite old. This updates to the latest release.
> > It's a headers library only. The two consumers openimageio and citra still build well.
> > 
> > It also makes the test suite working again.
> > 
> > OK to update?
> > 
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/robin-map/Makefile,v
> > diff -u -r1.3 Makefile
> > --- Makefile	26 Apr 2023 08:17:16 -0000	1.3
> > +++ Makefile	17 Feb 2024 18:20:18 -0000
> > @@ -4,8 +4,7 @@
> >  
> >  GH_ACCOUNT=	Tessil
> >  GH_PROJECT=	robin-map
> > -GH_TAGNAME=	v0.6.3
> > -REVISION =	0
> > +GH_TAGNAME=	v1.2.1
> >  
> >  CATEGORIES=	devel
> >  
> > @@ -13,15 +12,15 @@
> >  PERMIT_PACKAGE=	Yes
> >  
> >  MODULES=	devel/cmake
> > -
> > -TEST_DEPENDS=	devel/boost
> > +NO_BUILD = 	Yes

Please don't use NO_BUILD here. That is for when things break if you
don't use it.

> > +TEST_DEPENDS=	devel/boost devel/ninja
> >  
> >  do-test:
> >  	cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
> >  		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
> >  		${LOCALBASE}/bin/cmake -G ${_MODCMAKE_GEN} ${WRKSRC}/tests
> >  	cd ${WRKSRC}/tests && exec ${SETENV} ${ALL_TEST_ENV} \
> > -        	${NINJA} ${NINJA_FLAGS}
> > +        	ninja

ah, that was broken by cmake.port.mk r1.76 (devel/dlib will be affected
by the same thing). I think something like this would perhaps be better,
it then uses (a bit) more of the cmake build infra rather than hardcoding.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/robin-map/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile	26 Apr 2023 08:17:16 -0000	1.3
+++ Makefile	20 Feb 2024 13:31:25 -0000
@@ -4,8 +4,7 @@ COMMENT=	fast hash map and hash set
 
 GH_ACCOUNT=	Tessil
 GH_PROJECT=	robin-map
-GH_TAGNAME=	v0.6.3
-REVISION =	0
+GH_TAGNAME=	v1.2.1
 
 CATEGORIES=	devel
 
@@ -17,12 +16,12 @@ MODULES=	devel/cmake
 TEST_DEPENDS=	devel/boost
 
 do-test:
-	cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
-		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
-		${LOCALBASE}/bin/cmake -G ${_MODCMAKE_GEN} ${WRKSRC}/tests
-	cd ${WRKSRC}/tests && exec ${SETENV} ${ALL_TEST_ENV} \
-        	${NINJA} ${NINJA_FLAGS}
-	cd ${WRKSRC}/tests && ./tsl_robin_map_tests
+	cd ${WRKSRC}/tests && mkdir -p build && cd build && \
+		export CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" \
+		CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
+		&& ${LOCALBASE}/bin/cmake -G ${_MODCMAKE_GEN} .. \
+		&& ${LOCALBASE}/bin/cmake --build . \
+		&& ./tsl_robin_map_tests
 
 post-install:
 	mv ${PREFIX}/share/cmake/ ${PREFIX}/lib/
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/robin-map/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	3 Mar 2021 05:44:11 -0000	1.1.1.1
+++ distinfo	20 Feb 2024 13:31:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (robin-map-0.6.3.tar.gz) = 5mVMjCWY9j6wsdUv+L3znPzJHYHdXQUnSm3KkSQc1y8=
-SIZE (robin-map-0.6.3.tar.gz) = 64506
+SHA256 (robin-map-1.2.1.tar.gz) = K1TSwd4vc76lxR1dy9ZIE6CMrxv93P3u5Aq3TpWZ6OM=
+SIZE (robin-map-1.2.1.tar.gz) = 69356