astro/libosmium: update 2.18.0 → 2.19.0

This commit is contained in:
Dmitry Marakasov 2023-01-19 20:30:47 +03:00
parent e3b70a2e27
commit 150ecc3822
4 changed files with 4 additions and 44 deletions

View file

@ -1,7 +1,6 @@
PORTNAME= libosmium
DISTVERSIONPREFIX= v
DISTVERSION= 2.18.0
PORTREVISION= 1
DISTVERSION= 2.19.0
CATEGORIES= astro geography devel
MAINTAINER= amdmi3@FreeBSD.org
@ -38,15 +37,6 @@ OPTIONS_DEFAULT= TEST
TEST_TEST_TARGET= test
TEST_CMAKE_BOOL= BUILD_TESTING
post-patch:
@${FIND} ${WRKSRC} -type f \( -name "*.cpp" -o -name "*.hpp" \) \
-not -name "memory_mapping.hpp" \
-not -name "test_memory_mapping.cpp" \
-not -name "test_memory.cpp" \
-exec ${REINPLACE_CMD} \
-e 's,^#ifdef __linux__,#if defined(__linux__) || defined(__FreeBSD__),' \
-e 's,^#ifndef __linux__,#if !defined(__linux__) && !defined(__FreeBSD__),' {} \;
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1647270667
SHA256 (osmcode-libosmium-v2.18.0_GH0.tar.gz) = c05a3e95c9c811521ebad8637e90f43ab8fb053b310875acce741cc4c17d6f59
SIZE (osmcode-libosmium-v2.18.0_GH0.tar.gz) = 565862
TIMESTAMP = 1674129193
SHA256 (osmcode-libosmium-v2.19.0_GH0.tar.gz) = 6911a8ca8e81d49205357177982df908af11376919f93b814cccf02f1d4d63e3
SIZE (osmcode-libosmium-v2.19.0_GH0.tar.gz) = 565486

View file

@ -1,29 +0,0 @@
--- include/osmium/thread/util.hpp.orig 2022-02-07 12:59:17 UTC
+++ include/osmium/thread/util.hpp
@@ -38,8 +38,10 @@ DEALINGS IN THE SOFTWARE.
#include <thread>
#include <utility>
-#ifdef __linux__
+#if defined(__linux__)
# include <sys/prctl.h>
+#elif defined(__FreeBSD__)
+# include <pthread.h>
#endif
namespace osmium {
@@ -72,9 +74,13 @@ namespace osmium {
/**
* Set name of current thread for debugging. This only works on Linux.
*/
-#ifdef __linux__
+#if defined(__linux__)
inline void set_thread_name(const char* name) noexcept {
prctl(PR_SET_NAME, name, 0, 0, 0);
+ }
+#elif defined(__FreeBSD__)
+ inline void set_thread_name(const char* name) noexcept {
+ pthread_setname_np(pthread_self(), name);
}
#else
inline void set_thread_name(const char*) noexcept {

View file

@ -47,7 +47,6 @@ include/osmium/handler/disk_store.hpp
include/osmium/handler/dump.hpp
include/osmium/handler/node_locations_for_ways.hpp
include/osmium/handler/object_relations.hpp
include/osmium/index/bool_vector.hpp
include/osmium/index/detail/create_map_with_fd.hpp
include/osmium/index/detail/mmap_vector_anon.hpp
include/osmium/index/detail/mmap_vector_base.hpp