> http://build-failures.rhaalovely.net/powerpc/2020-04-09/geo/osrm-backend.log

Here is an update for osrm-backend. The goal was to possibly fix the
build on macppc, but devel/tbb does not support 64-bits atomics on
ppc32 [0], and forcing it does not fix the build.

Note that this is not a clang regression, this is the first time tbb is
built on macppc, it's only for clang archs.

You can find the changelog there [1].

Port-wise it's a very straightforward update, i've just disabled the
detection of ccache, and mark it NOT_FOR_ARCHS for powerpc.

It has been lightly tested on amd64 against Berlin.

Comments/feedback are welcome,

Charlène.

[0]
https://github.com/oneapi-src/oneTBB/blob/v2020.2/include/tbb/machine/mac_ppc.h#L60
[1]
https://github.com/Project-OSRM/osrm-backend/blob/v5.22.0/CHANGELOG.md


Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/osrm-backend/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile    12 Jul 2019 20:46:29 -0000      1.6
+++ Makefile    8 May 2020 14:48:47 -0000
@@ -1,11 +1,14 @@
 # $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:29 sthen Exp $
 
+# devel/tbb does not support 64-bits atomics on ppc32, forcing them does
+# not help, see tbb's ${WRKSRC}/include/tbb/machine/mac_ppc.h
+NOT_FOR_ARCHS =        powerpc
+
 COMMENT =              high-performance road network routing engine
 
 GH_ACCOUNT =           Project-OSRM
 GH_PROJECT =           osrm-backend
-GH_TAGNAME =           v5.18.0
-REVISION =             3
+GH_TAGNAME =           v5.22.0
 
 CATEGORIES =           geo
 
@@ -33,8 +36,10 @@ LIB_DEPENDS =                archivers/bzip2 \
 
 CONFIGURE_ARGS =       -DOSMIUM_INCLUDE_DIR=${LOCALBASE}/include/osmium \
                        -DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include/utfcpp \
-                               ${CXXFLAGS}"
+                               ${CXXFLAGS}" \
+                       -DENABLE_CCACHE=Off
 
+# Requires network access, and http access to sample osrm data is 403'd
 NO_TEST =              Yes
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/geo/osrm-backend/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo    6 Jul 2018 06:00:02 -0000       1.1.1.1
+++ distinfo    8 May 2020 14:48:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (osrm-backend-5.18.0.tar.gz) = 
25t5XepddMpk1xsW5lffAph6kOFQFKeZlOuguxRGbmE=
-SIZE (osrm-backend-5.18.0.tar.gz) = 6513098
+SHA256 (osrm-backend-5.22.0.tar.gz) = 
3wmHoEvPZddPnE4Y80oBmCvzu5eqR/nYbPuLNfF6alU=
+SIZE (osrm-backend-5.22.0.tar.gz) = 6492998
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/osrm-backend/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   10 Sep 2018 11:10:20 -0000      1.3
+++ pkg/PLIST   8 May 2020 14:48:47 -0000
@@ -78,13 +78,13 @@ include/osrm/util/coordinate.hpp
 include/osrm/util/exception.hpp
 include/osrm/util/json_container.hpp
 include/osrm/util/typedefs.hpp
-lib/libosrm.a
-lib/libosrm_contract.a
-lib/libosrm_customize.a
-lib/libosrm_extract.a
-lib/libosrm_partition.a
-lib/libosrm_store.a
-lib/libosrm_update.a
+@static-lib lib/libosrm.a
+@static-lib lib/libosrm_contract.a
+@static-lib lib/libosrm_customize.a
+@static-lib lib/libosrm_extract.a
+@static-lib lib/libosrm_partition.a
+@static-lib lib/libosrm_store.a
+@static-lib lib/libosrm_update.a
 lib/pkgconfig/libosrm.pc
 share/osrm/
 share/osrm/profiles/

Reply via email to